Merge branch 'oa/pull-reflog' into maint

* oa/pull-reflog: pull: remove extra space from reflog message

Merge branch 'oa/pull-reflog' into maint
* oa/pull-reflog: pull: remove extra space from reflog message
2a764974 · Junio C Hamano · 64b9db51 · c98d1e41 · 2a764974
隐藏空白更改
内联并排

Showing with 1 addition and 1 deletion

git-pull.sh git-pull.sh +1 -1

未找到文件。
--- 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