Merge branch 'oa/pull-reflog' into maint

* oa/pull-reflog:
  pull: remove extra space from reflog message
This commit is contained in:
Junio C Hamano 2011-08-16 12:41:13 -07:00
commit 2a76497427

View File

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