summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 872f501)
raw | patch | inline | side by side (parent: 872f501)
author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | |
Mon, 13 Sep 2010 18:49:29 +0000 (18:49 +0000) | ||
committer | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | |
Sat, 30 Oct 2010 07:58:20 +0000 (07:58 +0000) |
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
git-pull.sh | patch | blob | history |
diff --git a/git-pull.sh b/git-pull.sh
index 8c0ea23ac13bdabf978cedfc089545b0231e682c..a509f86deddeb143f0bf7c5b7bdcd9908d5f5543 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.
- echo >&2 "Warning: fetch updated the current branch head."
- echo >&2 "Warning: fast-forwarding your working tree from"
- echo >&2 "Warning: commit $orig_head."
+ echo >&2 "$(eval_gettext "Warning: fetch updated the current branch head.
+Warning: fast-forwarding your working tree from
+Warning: commit \$orig_head.")"
git update-index -q --refresh
git read-tree -u -m "$orig_head" "$curr_head" ||
die "$(eval_gettext "Cannot fast-forward your working tree.