Merge branch 'oa/pull-reflog' into maint

* oa/pull-reflog: pull: remove extra space from reflog message
2011-08-16 12:41:13 -07:00 · 2011-08-16 12:41:13 -07:00 · 2a76497427
parent 64b9db5109 c98d1e4148
commit 2a76497427
1 changed files with 1 additions and 1 deletions
--- 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