Merge branch 'oa/pull-reflog'

* oa/pull-reflog: pull: remove extra space from reflog message Conflicts: git-pull.sh
git-mirror · Aug 8, 2011 · 1421fd9 · 1421fd9
2 parents 6859043 + c98d1e4
commit 1421fd9
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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