X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-pull.sh;h=63da37bcc2730358140ae4b862040ed8fb0ed77e;hb=87afe9a5ed759668e35513c44eacd2fd393ba658;hp=eec3a07f0fa45013e8d9fa9a3dd1a2fab98a2970;hpb=da68bf337664f6160d56153cfe4a38c49a5185f3;p=git.git diff --git a/git-pull.sh b/git-pull.sh index eec3a07f0..63da37bcc 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.