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>

diff --git a/Documentation/git-diff.txt b/Documentation/git-diff.txt
index b180f1fa5bf5599efd8c8fefe29e3249cd387715..030f162f301608c329fecae04953620eb78f0b14 100644 (file)
--- 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
        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.
 
        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>.
 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 a5193b1e5c45e3d9a78de7604f104a8a80c3bdd8..89821ec74fe1d71764bcb320d1ac1021bd06201f 100644 (file)
--- 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
       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.";;
       case "$mb,$2" in
         "$2,$mb") info "Update is fast-forward" ;;
        *)        noff=y; info "This is not a fast-forward update.";;