diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-10-26 14:22:12 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-10-26 14:22:12 +0900 |
| commit | eed56667cdd517a184487c16a57b300ec079a199 (patch) | |
| tree | 05e9a22fef055d3a05bac6887c69ef09cece43ca /Documentation/howto/update-hook-example.txt | |
| parent | Merge branch 'du/rev-parse-is-plumbing' (diff) | |
| parent | doc: fix a typo and clarify a sentence (diff) | |
| download | tgif-eed56667cdd517a184487c16a57b300ec079a199.tar.xz | |
Merge branch 'mm/doc-no-dashed-git'
Doc update.
* mm/doc-no-dashed-git:
doc: fix a typo and clarify a sentence
Diffstat (limited to 'Documentation/howto/update-hook-example.txt')
| -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.";; |