diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-10-26 15:37:13 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-10-26 15:37:13 +0900 |
| commit | a4df8edd688285dc532353d4075d979d5ec20306 (patch) | |
| tree | ac3e6fa9574d31098f3ad59fc1cd4deb27454cbe /git-diff.txt | |
| parent | abe2c594325aec522daad772d880e019c2a55747 (diff) | |
| download | git-htmldocs-a4df8edd688285dc532353d4075d979d5ec20306.tar.gz | |
Autogenerated HTML docs for v2.19.1-593-gc670b
Diffstat (limited to 'git-diff.txt')
| -rw-r--r-- | git-diff.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git-diff.txt b/git-diff.txt index b180f1fa5..030f162f3 100644 --- a/git-diff.txt +++ b/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>. |