diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-11-21 22:58:04 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-11-21 22:58:05 +0900 |
| commit | 53016f4c13c7b6cb95be4b9bd93b3f6cf30b3ad7 (patch) | |
| tree | fb4a2f2a3663d35ba6814e7f6869019d06da4d9c /Documentation | |
| parent | Merge branch 'du/rev-parse-is-plumbing' into maint (diff) | |
| parent | doc: fix a typo and clarify a sentence (diff) | |
| download | tgif-53016f4c13c7b6cb95be4b9bd93b3f6cf30b3ad7.tar.xz | |
Merge branch 'mm/doc-no-dashed-git' into maint
Doc update.
* mm/doc-no-dashed-git:
doc: fix a typo and clarify a sentence
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-diff.txt | 4 | ||||
| -rw-r--r-- | Documentation/howto/update-hook-example.txt | 2 |
2 files changed, 3 insertions, 3 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>. diff --git a/Documentation/howto/update-hook-example.txt b/Documentation/howto/update-hook-example.txt index a5193b1e5c..89821ec74f 100644 --- a/Documentation/howto/update-hook-example.txt +++ b/Documentation/howto/update-hook-example.txt @@ -80,7 +80,7 @@ case "$1" in info "The branch '$1' is new..." else # updating -- make sure it is a fast-forward - mb=$(git-merge-base "$2" "$3") + mb=$(git merge-base "$2" "$3") case "$mb,$2" in "$2,$mb") info "Update is fast-forward" ;; *) noff=y; info "This is not a fast-forward update.";; |