mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
docs: fix some antique example output
These diff-index and diff-tree sample outputs date back to the first month of git's existence. The output format has changed slightly since then, so let's have it match the current output. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
715e716a1b
commit
62b42d3487
|
@ -96,8 +96,8 @@ show that. So let's say that you have edited `kernel/sched.c`, but
|
||||||
have not actually done a 'git update-index' on it yet - there is no
|
have not actually done a 'git update-index' on it yet - there is no
|
||||||
"object" associated with the new state, and you get:
|
"object" associated with the new state, and you get:
|
||||||
|
|
||||||
torvalds@ppc970:~/v2.6/linux> git diff-index HEAD
|
torvalds@ppc970:~/v2.6/linux> git diff-index --abbrev HEAD
|
||||||
*100644->100664 blob 7476bb......->000000...... kernel/sched.c
|
:100644 100664 7476bb... 000000... kernel/sched.c
|
||||||
|
|
||||||
i.e., it shows that the tree has changed, and that `kernel/sched.c` has is
|
i.e., it shows that the tree has changed, and that `kernel/sched.c` has is
|
||||||
not up-to-date and may contain new stuff. The all-zero sha1 means that to
|
not up-to-date and may contain new stuff. The all-zero sha1 means that to
|
||||||
|
|
|
@ -138,8 +138,8 @@ so it can be used to name subdirectories.
|
||||||
|
|
||||||
An example of normal usage is:
|
An example of normal usage is:
|
||||||
|
|
||||||
torvalds@ppc970:~/git> git diff-tree 5319e4......
|
torvalds@ppc970:~/git> git diff-tree --abbrev 5319e4
|
||||||
*100664->100664 blob ac348b.......->a01513....... git-fsck-objects.c
|
:100664 100664 ac348b... a01513... git-fsck-objects.c
|
||||||
|
|
||||||
which tells you that the last commit changed just one file (it's from
|
which tells you that the last commit changed just one file (it's from
|
||||||
this one:
|
this one:
|
||||||
|
|
Loading…
Reference in a new issue