X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fhowto%2Fupdate-hook-example.txt;h=b7f8d416d65ca1cf17d6348e858a13f6ed72c7fe;hb=65c042d44dc843021f1410f1219104681fdd3469;hp=697d9188850e9a685045da5bd37844b02978752d;hpb=b43b73666be32ecdc27384d67dc88e4b4869efa1;p=git.git diff --git a/Documentation/howto/update-hook-example.txt b/Documentation/howto/update-hook-example.txt index 697d91888..b7f8d416d 100644 --- a/Documentation/howto/update-hook-example.txt +++ b/Documentation/howto/update-hook-example.txt @@ -76,7 +76,7 @@ case "$1" in if expr "$2" : '0*$' >/dev/null; then info "The branch '$1' is new..." else - # updating -- make sure it is a fast forward + # updating -- make sure it is a fast-forward mb=$(git-merge-base "$2" "$3") case "$mb,$2" in "$2,$mb") info "Update is fast-forward" ;;