diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-08-08 12:33:36 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-08-08 12:33:36 -0700 |
| commit | 1421fd9df4f1e3ed232bd1c683c6e264a464a41e (patch) | |
| tree | 7236b41402907f8f644f7623d655603084bb6404 | |
| parent | Merge branch 'ms/reflog-show-is-default' (diff) | |
| parent | pull: remove extra space from reflog message (diff) | |
| download | tgif-1421fd9df4f1e3ed232bd1c683c6e264a464a41e.tar.xz | |
Merge branch 'oa/pull-reflog'
* oa/pull-reflog:
pull: remove extra space from reflog message
Conflicts:
git-pull.sh
| -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 a10b1290bc..eec3a07f0f 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 |