Merge branch 'oa/pull-reflog'

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

Conflicts:
	git-pull.sh

diff --cc git-pull.sh
index a10b1290bc9218942fcec54b9e930f072ca11bce,28441aca8ac1129dacad10d4bd040df64e34d134..eec3a07f0fa45013e8d9fa9a3dd1a2fab98a2970
--- 1/git-pull.sh
--- 2/git-pull.sh
+++ b/git-pull.sh
@@@ -9,8 -9,7 +9,8 @@@ LONG_USAGE='Fetch one or more remote re
  SUBDIRECTORY_OK=Yes
  OPTIONS_SPEC=
  . git-sh-setup
- set_reflog_action "pull $*"
 +. git-sh-i18n
+ set_reflog_action "pull${1+ $*}"
  require_work_tree
  cd_to_toplevel