cherry-pick: Suggest a better method to retain authorship

diff --git a/git-merge.sh b/git-merge.sh
index 498c938c4507ccdc27f5a9e30e85f013a067c876..4afcd95316c01e5d1811184c615c4da574ab0717 100755 (executable)
--- a/git-merge.sh
+++ b/git-merge.sh
@@ -294,7 +294,7 @@ f,*)
        git-update-index --refresh 2>/dev/null
        new_head=$(git-rev-parse --verify "$1^0") &&
        git-read-tree -v -m -u --exclude-per-directory=.gitignore $head "$new_head" &&
-       finish "$new_head" "Fast forward"
+       finish "$new_head" "Fast forward" || exit
        dropsave
        exit 0
        ;;