diff options
author | Junio C Hamano <gitster@pobox.com> | 2011-08-16 12:41:13 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2011-08-16 12:41:13 -0700 |
commit | 2a764974271aa36101b241fef8e2945db9b418a5 (patch) | |
tree | d75746f4cc5ef94002505c0a15f586213d1c5441 | |
parent | 64b9db510986652a64227bb7370dbf8cc7f057ba (diff) | |
parent | c98d1e4148ec32cac3318ca96dd262d27b9f8a03 (diff) | |
download | git-2a764974271aa36101b241fef8e2945db9b418a5.tar.gz |
Merge branch 'oa/pull-reflog' into maint
* oa/pull-reflog:
pull: remove extra space from reflog message
-rwxr-xr-x | git-pull.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-pull.sh b/git-pull.sh index fb9e2df931..28441aca8a 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 |