diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-08-25 16:00:16 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-08-25 16:00:16 -0700 |
| commit | 957450054cfbbe0d4ae8d33f7b74eace6e290f16 (patch) | |
| tree | 65c27de698831bd6222152aa3dff0d7319628f27 /git-pull.sh | |
| parent | 1952e102b702b977d6bdfcee7cb48b843cb92049 (diff) | |
| parent | 6ff875c52ae48b8fe6a350df110e33aa2ba8afbc (diff) | |
| download | git-957450054cfbbe0d4ae8d33f7b74eace6e290f16.tar.gz | |
Merge branch 'js/i18n-scripts'
* js/i18n-scripts:
submodule: take advantage of gettextln and eval_gettextln.
stash: take advantage of eval_gettextln
pull: take advantage of eval_gettextln
git-am: take advantage of gettextln and eval_gettextln.
gettext: add gettextln, eval_gettextln to encode common idiom
Diffstat (limited to 'git-pull.sh')
| -rwxr-xr-x | git-pull.sh | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/git-pull.sh b/git-pull.sh index eec3a07f0f..63da37bcc2 100755 --- a/git-pull.sh +++ b/git-pull.sh @@ -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. |