Gitのオブジェクト/インデックスを理解して、直感的にGitを使いこなしましょう。 解説記事 http://d.hatena.ne.jp/ja9/20110822/1313986395

1. TDDBC Tokyo 1.7 for PHP
2011-08-21
@madapaja

26. < >< >

27. < >< >

28. < >< >

29. < >< >

30. 5ae168cf492bead24f9c24319e3ef2ba3d5b8f3a
blob 956
<?php
namespace Xanadu;
class Controller
{
private $name;
:
:

31. 5ae168cf492bead24f9c24319e3ef2ba3d5b8f3a
blob 956
<?php
namespace Xanadu;
class Controller
{
private $name;
:
:

32. 5ae168cf492bead24f9c24319e3ef2ba3d5b8f3a
blob 956
<?php
namespace Xanadu;
class Controller
{
private $name;
:
:

33. a7e52bd45207ff7d202125b5eab2bdf172c506e9
tree 42
100644 blob 5ae168cf492bead24f9c24319e3ef2ba3d5b8f3a Controller.php

34. a7e52bd45207ff7d202125b5eab2bdf172c506e9
tree 42
mode
100644 blob 5ae168cf492bead24f9c24319e3ef2ba3d5b8f3a Controller.php

35. a7e52bd45207ff7d202125b5eab2bdf172c506e9
tree 42
mode
100644 blob 5ae168cf492bead24f9c24319e3ef2ba3d5b8f3a Controller.php

36. a7e52bd45207ff7d202125b5eab2bdf172c506e9
tree 42
mode
100644 blob 5ae168cf492bead24f9c24319e3ef2ba3d5b8f3a Controller.php

37. a7e52bd45207ff7d202125b5eab2bdf172c506e9
tree 42
mode
100644 blob 5ae168cf492bead24f9c24319e3ef2ba3d5b8f3a Controller.php

38. 54be572c17595e83dd84bbb14cae7edb9dd65a18
commit 172
tree a7e52bd45207ff7d202125b5eab2bdf172c506e9
author madapaja <iwasaki@cresc.com> 1313731598 +0900
committer madapaja <iwasaki@cresc.com> 1313731598 +0900
my first commit

39. $ git tag stable-1

49. checkout

50. checkout

51. checkout
add

52. checkout
add
commit

53. checkout
add

54. checkout
add

55. checkout
add
commit

56. checkout
add
commit

57. checkout
add

58. checkout
add

59. checkout
add
add

60. checkout
add
add
commit

62. $ cd path/to/project
$ git init

63. $ cd path/to/project
$ git init
$ git clone git://path/to/project
$ cd project

65. $ git add target.php
$ git add -u

66. $ git add target.php
$ git add -u
$ git rm --cached target.php
$ git rm target.php

67. $ git add target.php
$ git add -u
$ git rm --cached target.php
$ git rm target.php
$ git status

68. $ git add target.php
$ git add -u
$ git rm --cached target.php
$ git rm target.php
$ git status
$ git diff

69. $ git add target.php
$ git add -u
$ git rm --cached target.php
$ git rm target.php
$ git status
$ git diff
$ git checkout target.php

70. $ git add target.php
$ git add -u
$ git rm --cached target.php
$ git rm target.php
$ git status
$ git diff
$ git checkout target.php
$ git reset HEAD target.php

72. $ git diff --cached

73. $ git diff --cached
$ git commit

74. $ git diff --cached
$ git commit
$ git commit --amend

75. $ git diff --cached
$ git commit
$ git commit --amend
$ git reset --soft HEAD^

77. $ git diff HEAD

78. $ git diff HEAD
git add -u && git commit
$ git commit -a

79. $ git diff HEAD
git add -u && git commit
$ git commit -a
$ git revert a5102ef4

80. $ git diff HEAD
git add -u && git commit
$ git commit -a
$ git revert a5102ef4
$ git reset --hard HEAD^

82. $ git checkout master

83. $ git checkout master
git branch branch1 && git checkout branch1
$ git checkout -b branch1

84. $ git checkout master
git branch branch1 && git checkout branch1
$ git checkout -b branch1
$ git merge new_function
$ git merge --no-commit new_function

86. $ git log

87. $ git log
$ git diff HEAD^..HEAD

88. $ git log
$ git diff HEAD^..HEAD
$ git branch

89. $ git log
$ git diff HEAD^..HEAD
$ git branch
$ git branch experimental

90. $ git log
$ git diff HEAD^..HEAD
$ git branch
$ git branch experimental
$ git branch -d experimental
$ git branch -D experimental

92. $ git branch -r

93. $ git branch -r
$ git fetch origin

94. $ git branch -r
$ git fetch origin
$ git merge origin/master

95. $ git branch -r
$ git fetch origin
$ git merge origin/master
git fetch origin && git merge origin/master
$ git pull origin master

96. $ git branch -r
$ git fetch origin
$ git merge origin/master
git fetch origin && git merge origin/master
$ git pull origin master
$ git push origin :experimental

97. $ git branch -r
$ git fetch origin
$ git merge origin/master
git fetch origin && git merge origin/master
$ git pull origin master
$ git push origin :experimental
$ git push origin master