diff options
| author | Mihir Mehta <mihir@cs.utexas.edu> | 2018-10-11 01:26:54 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-10-11 03:39:15 +0300 |
| commit | ca8ed443a5c4bcfdc0b89d418f4ea34fef8a9c97 (patch) | |
| tree | 5ea914b04cba3d934281c5ae9772a06a31d00cea /Documentation/howto | |
| parent | 268fbcd172cdb306e8a3e7143cc16677c963d6cd (diff) | |
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>
Diffstat (limited to 'Documentation/howto')
| -rw-r--r-- | Documentation/howto/update-hook-example.txt | 2 |
1 files changed, 1 insertions, 1 deletions
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.";; |