summaryrefslogtreecommitdiff
path: root/git-pull.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-08-08 19:33:36 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-08-08 19:33:36 (GMT)
commit1421fd9df4f1e3ed232bd1c683c6e264a464a41e (patch)
tree7236b41402907f8f644f7623d655603084bb6404 /git-pull.sh
parent68590435c147b3fdd4cbb1c068b2f9d793c02246 (diff)
parentc98d1e4148ec32cac3318ca96dd262d27b9f8a03 (diff)
downloadgit-1421fd9df4f1e3ed232bd1c683c6e264a464a41e.zip
git-1421fd9df4f1e3ed232bd1c683c6e264a464a41e.tar.gz
git-1421fd9df4f1e3ed232bd1c683c6e264a464a41e.tar.bz2
Merge branch 'oa/pull-reflog'
* oa/pull-reflog: pull: remove extra space from reflog message Conflicts: git-pull.sh
Diffstat (limited to 'git-pull.sh')
-rwxr-xr-xgit-pull.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-pull.sh b/git-pull.sh
index a10b129..eec3a07 100755
--- 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