rebase: Allow merge strategies to be used when rebasing

diff --git a/git-applypatch.sh b/git-applypatch.sh
index 214f5c31a6020ae63b4fee3c245156717d536252..e4b09472e1fa27a6431b431572af7353c4f0a9b2 100755 (executable)
--- a/git-applypatch.sh
+++ b/git-applypatch.sh
@@ -14,7 +14,7 @@
 USAGE='<msg> <patch> <info> [<signoff>]'
 . git-sh-setup
 
-[[ "$#" = "3" || "$#" = "4" ]] || usage
+case "$#" in 3|4) ;; *) usage ;; esac
 
 final=.dotest/final-commit
 ##
@@ -204,7 +204,7 @@ echo Wrote tree $tree
 parent=$(git-rev-parse --verify HEAD) &&
 commit=$(git-commit-tree $tree -p $parent <"$final") || exit 1
 echo Committed: $commit
-git-update-ref HEAD $commit $parent || exit
+git-update-ref -m "applypatch: $SUBJECT" HEAD $commit $parent || exit
 
 if test -x "$GIT_DIR"/hooks/post-applypatch
 then