[PATCH 4/4] docs: fix some antique example output
- From
Jeff King <peff@peff.net>
- Date
- May 27, 2011, 02:33 UTC
- Message-ID
- <20110527023315.GD25362@sigill.intra.peff.net>
- In-Reply-To
- <30543.1305828072@plover.com>
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> --- I just noticed these while auditing all of the "->" in the docs directory. I didn't read through the whole text to make sure there were no other inaccuracies, though.
Documentation/git-diff-index.txt | 4 ++-- 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 6d18486..2ea22ab 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 4e5f127..1439486 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:
-- 1.7.4.5.26.g0c6a2