Merge branch 'oa/pull-reflog' into maint

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

diff --git a/git-pull.sh b/git-pull.sh
index fb9e2df9312e96ecf8ad5ab2bde4b74b979fe02e..28441aca8ac1129dacad10d4bd040df64e34d134 100755 (executable)
--- a/git-pull.sh
+++ b/git-pull.sh
@@ -9,7 +9,7 @@ LONG_USAGE='Fetch one or more remote refs and merge it/them into the current HEA
 SUBDIRECTORY_OK=Yes
 OPTIONS_SPEC=
 . git-sh-setup
-set_reflog_action "pull $*"
+set_reflog_action "pull${1+ $*}"
 require_work_tree
 cd_to_toplevel