Merge branch 'oa/pull-reflog'

* oa/pull-reflog:
pull: remove extra space from reflog message

Conflicts:
git-pull.sh

diff --git a/git-pull.sh b/git-pull.sh
index a10b1290bc9218942fcec54b9e930f072ca11bce..eec3a07f0fa45013e8d9fa9a3dd1a2fab98a2970 100755 (executable)
--- a/git-pull.sh
+++ b/git-pull.sh
@@ -10,7 +10,7 @@ SUBDIRECTORY_OK=Yes
 OPTIONS_SPEC=
 . git-sh-setup
 . git-sh-i18n
-set_reflog_action "pull $*"
+set_reflog_action "pull${1+ $*}"
 require_work_tree
 cd_to_toplevel