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.html | |
parent | abe2c594325aec522daad772d880e019c2a55747 (diff) | |
download | git-htmldocs-a4df8edd688285dc532353d4075d979d5ec20306.tar.gz |
Autogenerated HTML docs for v2.19.1-593-gc670b
Diffstat (limited to 'git-diff.html')
-rw-r--r-- | git-diff.html | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/git-diff.html b/git-diff.html index 9e644e6c5..718f1a250 100644 --- a/git-diff.html +++ b/git-diff.html @@ -843,12 +843,12 @@ two blob objects, or changes between two files on disk.</p></div> 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.
</p>
</dd>
</dl></div>
-<div class="paragraph"><p>Just in case if you are doing something exotic, it should be
+<div class="paragraph"><p>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>.</p></div>
@@ -2807,7 +2807,7 @@ Output diff in reverse. <div id="footer">
<div id="footer-text">
Last updated
- 2018-06-01 00:13:01 PDT
+ 2018-10-26 15:36:57 JST
</div>
</div>
</body>
|