diff options
| author | Mihir Mehta <mihir@cs.utexas.edu> | 2018-10-10 22:26:54 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-10-11 00:39:15 (GMT) |
| commit | ca8ed443a5c4bcfdc0b89d418f4ea34fef8a9c97 (patch) | |
| tree | 5ea914b04cba3d934281c5ae9772a06a31d00cea | |
| parent | 268fbcd172cdb306e8a3e7143cc16677c963d6cd (diff) | |
| download | git-ca8ed443a5c4bcfdc0b89d418f4ea34fef8a9c97.zip git-ca8ed443a5c4bcfdc0b89d418f4ea34fef8a9c97.tar.gz git-ca8ed443a5c4bcfdc0b89d418f4ea34fef8a9c97.tar.bz2 | |
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>
| -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 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.";; |