summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: de88c1c)
raw | patch | inline | side by side (parent: de88c1c)
author | Jon Seymour <jon.seymour@gmail.com> | |
Sun, 7 Aug 2011 11:58:15 +0000 (21:58 +1000) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Mon, 8 Aug 2011 19:04:42 +0000 (12:04 -0700) |
Signed-off-by: Jon Seymour <jon.seymour@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
git-pull.sh | patch | blob | history |
diff --git a/git-pull.sh b/git-pull.sh
index a10b1290bc9218942fcec54b9e930f072ca11bce..d3ffd8fc6eab115988884b1ea3e4c22a1e45e802 100755 (executable)
--- a/git-pull.sh
+++ b/git-pull.sh
# $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.