We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
There was an error while loading. Please reload this page.
1 parent de88c1c commit c2b1a95Copy full SHA for c2b1a95
git-pull.sh
@@ -217,12 +217,9 @@ then
217
# $orig_head commit, but we are merging into $curr_head.
218
# First update the working tree to match $curr_head.
219
220
- (
221
- eval_gettext "Warning: fetch updated the current branch head.
+ eval_gettextln "Warning: fetch updated the current branch head.
222
Warning: fast-forwarding your working tree from
223
-Warning: commit \$orig_head." &&
224
- echo
225
- ) >&2
+Warning: commit \$orig_head." >&2
226
git update-index -q --refresh
227
git read-tree -u -m "$orig_head" "$curr_head" ||
228
die "$(eval_gettext "Cannot fast-forward your working tree.
0 commit comments