Merge branch 'oa/pull-reflog'

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

Conflicts:
	git-pull.sh
This commit is contained in:
Junio C Hamano 2011-08-08 12:33:36 -07:00
commit 1421fd9df4

View file

@ -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