summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-10-26 05:22:12 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-10-26 05:22:12 (GMT)
commiteed56667cdd517a184487c16a57b300ec079a199 (patch)
tree05e9a22fef055d3a05bac6887c69ef09cece43ca
parent7db60837be0c38040efe47e9459cfb6da3bc5927 (diff)
parentca8ed443a5c4bcfdc0b89d418f4ea34fef8a9c97 (diff)
downloadgit-eed56667cdd517a184487c16a57b300ec079a199.zip
git-eed56667cdd517a184487c16a57b300ec079a199.tar.gz
git-eed56667cdd517a184487c16a57b300ec079a199.tar.bz2
Merge branch 'mm/doc-no-dashed-git'
Doc update. * mm/doc-no-dashed-git: doc: fix a typo and clarify a sentence
-rw-r--r--Documentation/git-diff.txt4
-rw-r--r--Documentation/howto/update-hook-example.txt2
2 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/git-diff.txt b/Documentation/git-diff.txt
index b180f1f..030f162 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 a5193b1..89821ec 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.";;