From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 8 Aug 2011 19:33:36 +0000 (-0700)
Subject: Merge branch 'oa/pull-reflog'
X-Git-Tag: v1.7.7-rc0~41
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=1421fd9df4f1e3ed232bd1c683c6e264a464a41e;p=git.git

Merge branch 'oa/pull-reflog'

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

Conflicts:
	git-pull.sh
---

1421fd9df4f1e3ed232bd1c683c6e264a464a41e
diff --cc git-pull.sh
index a10b1290b,28441aca8..eec3a07f0
--- a/git-pull.sh
+++ b/git-pull.sh
@@@ -9,8 -9,7 +9,8 @@@ LONG_USAGE='Fetch one or more remote re
  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