X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-pull.sh;h=63da37bcc2730358140ae4b862040ed8fb0ed77e;hb=3c1ed90ec3973404ffcff99103faa5b863889f98;hp=a10b1290bc9218942fcec54b9e930f072ca11bce;hpb=e85a43bc442d906b1cce112f154e54c216a0ab6e;p=git.git

diff --git a/git-pull.sh b/git-pull.sh
index a10b1290b..63da37bcc 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
 
@@ -217,12 +217,9 @@ then
 	# $orig_head commit, but we are merging into $curr_head.
 	# First update the working tree to match $curr_head.
 
-	(
-		eval_gettext "Warning: fetch updated the current branch head.
+	eval_gettextln "Warning: fetch updated the current branch head.
 Warning: fast-forwarding your working tree from
-Warning: commit \$orig_head." &&
-		echo
-	) >&2
+Warning: commit \$orig_head." >&2
 	git update-index -q --refresh
 	git read-tree -u -m "$orig_head" "$curr_head" ||
 		die "$(eval_gettext "Cannot fast-forward your working tree.