summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-08-16 19:41:13 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-08-16 19:41:13 (GMT)
commit2a764974271aa36101b241fef8e2945db9b418a5 (patch)
treed75746f4cc5ef94002505c0a15f586213d1c5441
parent64b9db510986652a64227bb7370dbf8cc7f057ba (diff)
parentc98d1e4148ec32cac3318ca96dd262d27b9f8a03 (diff)
downloadgit-2a764974271aa36101b241fef8e2945db9b418a5.zip
git-2a764974271aa36101b241fef8e2945db9b418a5.tar.gz
git-2a764974271aa36101b241fef8e2945db9b418a5.tar.bz2
Merge branch 'oa/pull-reflog' into maint
* oa/pull-reflog: pull: remove extra space from reflog message
-rwxr-xr-xgit-pull.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-pull.sh b/git-pull.sh
index fb9e2df..28441ac 100755
--- 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