diff options
| author | Jeff King <peff@peff.net> | 2011-05-26 22:33:15 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-05-26 22:15:39 -0700 |
| commit | 62b42d348754231609e07912ac42da6b112008ef (patch) | |
| tree | 951ae8a5851dfcc9cf3fae18c11433b411deb11c | |
| parent | 715e716a1b5bc1bc71715286e7a10b7e0c3188e8 (diff) | |
| download | git-62b42d348754231609e07912ac42da6b112008ef.tar.gz git-62b42d348754231609e07912ac42da6b112008ef.tar.xz | |
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>
| -rw-r--r-- | Documentation/git-diff-index.txt | 4 | ||||
| -rw-r--r-- | Documentation/git-diff-tree.txt | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/git-diff-index.txt b/Documentation/git-diff-index.txt index 6d1848640..2ea22abca 100644 --- a/Documentation/git-diff-index.txt +++ b/Documentation/git-diff-index.txt @@ -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 "object" associated with the new state, and you get: - torvalds@ppc970:~/v2.6/linux> git diff-index HEAD - *100644->100664 blob 7476bb......->000000...... kernel/sched.c + torvalds@ppc970:~/v2.6/linux> git diff-index --abbrev HEAD + :100644 100664 7476bb... 000000... kernel/sched.c 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 diff --git a/Documentation/git-diff-tree.txt b/Documentation/git-diff-tree.txt index 4e5f127ef..1439486e4 100644 --- a/Documentation/git-diff-tree.txt +++ b/Documentation/git-diff-tree.txt @@ -138,8 +138,8 @@ so it can be used to name subdirectories. An example of normal usage is: - torvalds@ppc970:~/git> git diff-tree 5319e4...... - *100664->100664 blob ac348b.......->a01513....... git-fsck-objects.c + torvalds@ppc970:~/git> git diff-tree --abbrev 5319e4 + :100664 100664 ac348b... a01513... git-fsck-objects.c which tells you that the last commit changed just one file (it's from this one: |