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>
Mihir Mehta committed
Oct 10, 2018 at 17:26 UTC
ca8ed443a5c4bcfdc0b89d418f4ea34fef8a9c97
2 files changed
+3
-3
Documentation/git-diff.txt
+2
-2
@@ -72,10 +72,10 @@ two blob objects, or changes between two files on disk.
72
This form is to view the changes on the branch containing
73
and up to the second <commit>, starting at a common ancestor
74
of both <commit>. "git diff A\...B" is equivalent to
75
- "git diff $(git-merge-base A B) B". You can omit any one
75
+ "git diff $(git merge-base A B) B". You can omit any one
76
of <commit>, which has the same effect as using HEAD instead.
77
78
-Just in case if you are doing something exotic, it should be
78
+Just in case you are doing something exotic, it should be
79
noted that all of the <commit> in the above description, except
80
in the last two forms that use ".." notations, can be any
81
<tree>.
Documentation/howto/update-hook-example.txt
+1
-1
@@ -80,7 +80,7 @@ case "$1" in
80
info "The branch '$1' is new..."
81
else
82
# updating -- make sure it is a fast-forward
83
- mb=$(git-merge-base "$2" "$3")
83
+ mb=$(git merge-base "$2" "$3")
84
case "$mb,$2" in
85
"$2,$mb") info "Update is fast-forward" ;;
86
*) noff=y; info "This is not a fast-forward update.";;