Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Don't use dash commands (git-foo) in tutorial-2
author
Ted Percival
<ted@midg3t.net>
Thu, 26 Jun 2008 13:22:19 +0000
(23:22 +1000)
committer
Junio C Hamano
<gitster@pobox.com>
Fri, 27 Jun 2008 01:30:57 +0000
(18:30 -0700)
Signed-off-by: Ted Percival <ted@midg3t.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/gittutorial-2.txt
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
4c7ba95
)
diff --git
a/Documentation/gittutorial-2.txt
b/Documentation/gittutorial-2.txt
index e3d5c1fbf004760d4063352c2dd594e6b98b865f..31e8a23a4f3d9d842d950247ee4bd0c73c46e808 100644
(file)
--- a/
Documentation/gittutorial-2.txt
+++ b/
Documentation/gittutorial-2.txt
@@
-61,9
+61,9
@@
from your own version. Note that you can shorten it to only a few
characters to save yourself typing all 40 hex digits:
------------------------------------------------
characters to save yourself typing all 40 hex digits:
------------------------------------------------
-$ git
-
cat-file -t 54196cc2
+$ git
cat-file -t 54196cc2
commit
commit
-$ git
-
cat-file commit 54196cc2
+$ git
cat-file commit 54196cc2
tree 92b8b694ffb1675e5975148e1121810081dbdffe
author J. Bruce Fields <bfields@puzzle.fieldses.org> 1143414668 -0500
committer J. Bruce Fields <bfields@puzzle.fieldses.org> 1143414668 -0500
tree 92b8b694ffb1675e5975148e1121810081dbdffe
author J. Bruce Fields <bfields@puzzle.fieldses.org> 1143414668 -0500
committer J. Bruce Fields <bfields@puzzle.fieldses.org> 1143414668 -0500
@@
-166,7
+166,7
@@
hello world!
and the "parent" object refers to the previous commit:
------------------------------------------------
and the "parent" object refers to the previous commit:
------------------------------------------------
-$ git
-
cat-file commit 54196cc2
+$ git
cat-file commit 54196cc2
tree 92b8b694ffb1675e5975148e1121810081dbdffe
author J. Bruce Fields <bfields@puzzle.fieldses.org> 1143414668 -0500
committer J. Bruce Fields <bfields@puzzle.fieldses.org> 1143414668 -0500
tree 92b8b694ffb1675e5975148e1121810081dbdffe
author J. Bruce Fields <bfields@puzzle.fieldses.org> 1143414668 -0500
committer J. Bruce Fields <bfields@puzzle.fieldses.org> 1143414668 -0500
@@
-246,7
+246,7
@@
The last diff is empty, but no new commits have been made, and the
head still doesn't contain the new line:
------------------------------------------------
head still doesn't contain the new line:
------------------------------------------------
-$ git
-
diff HEAD
+$ git
diff HEAD
diff --git a/file.txt b/file.txt
index a042389..513feba 100644
--- a/file.txt
diff --git a/file.txt b/file.txt
index a042389..513feba 100644
--- a/file.txt
@@
-273,7
+273,7
@@
hello world, again
So what our "git add" did was store a new blob and then put
a reference to it in the index file. If we modify the file again,
So what our "git add" did was store a new blob and then put
a reference to it in the index file. If we modify the file again,
-we'll see that the new modifications are reflected in the "git
-
diff"
+we'll see that the new modifications are reflected in the "git
diff"
output:
------------------------------------------------
output:
------------------------------------------------