Make sha1flush void and remove conditional return.

diff --git a/git-pull.sh b/git-pull.sh
index d337bf4da31c8a86eeaee7b34b910611100ccca8..f380437997f053d15a177a941f3b8a1543c56a18 100755 (executable)
--- a/git-pull.sh
+++ b/git-pull.sh
@@ -102,5 +102,6 @@ case "$strategy_args" in
 esac
 
 merge_name=$(git-fmt-merge-msg <"$GIT_DIR/FETCH_HEAD") || exit
-git-merge $no_summary $no_commit $squash $strategy_args \
+git-merge "--reflog-action=pull $*" \
+       $no_summary $no_commit $squash $strategy_args \
        "$merge_name" HEAD $merge_head