diff options
| author | Mihir Mehta <mihir@cs.utexas.edu> | 2018-10-10 17:26:54 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-10-11 09:39:15 +0900 |
| commit | ca8ed443a5c4bcfdc0b89d418f4ea34fef8a9c97 (patch) | |
| tree | 5ea914b04cba3d934281c5ae9772a06a31d00cea /Documentation/git-diff.txt | |
| parent | 268fbcd172cdb306e8a3e7143cc16677c963d6cd (diff) | |
| download | git-ca8ed443a5c4bcfdc0b89d418f4ea34fef8a9c97.tar.gz | |
doc: fix a typo and clarify a sentence
I noticed that git-merge-base was unlikely to actually be a git command,
and tried it in my shell. Seeing that it doesn't work, I cleaned up two
places in the docs where it appears.
Signed-off-by: Mihir Mehta <mihir@cs.utexas.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-diff.txt')
| -rw-r--r-- | Documentation/git-diff.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-diff.txt b/Documentation/git-diff.txt index b180f1fa5b..030f162f30 100644 --- a/Documentation/git-diff.txt +++ b/Documentation/git-diff.txt @@ -72,10 +72,10 @@ two blob objects, or changes between two files on disk. This form is to view the changes on the branch containing and up to the second <commit>, starting at a common ancestor of both <commit>. "git diff A\...B" is equivalent to - "git diff $(git-merge-base A B) B". You can omit any one + "git diff $(git merge-base A B) B". You can omit any one of <commit>, which has the same effect as using HEAD instead. -Just in case if you are doing something exotic, it should be +Just in case you are doing something exotic, it should be noted that all of the <commit> in the above description, except in the last two forms that use ".." notations, can be any <tree>. |