зеркало из https://github.com/microsoft/git.git
git-pull: further safety while on tracking branch.
Running 'git pull' while on the tracking branch has a built-in safety valve to fast-forward the index and working tree to match the branch head, but it errs on the safe side too cautiously. Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Родитель
3103cf9e1e
Коммит
cf46e7b899
|
@ -55,7 +55,9 @@ then
|
|||
# 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."
|
||||
echo >&2 "Warning: fast forwarding your working tree from"
|
||||
echo >&2 "Warning: $orig_head commit."
|
||||
git-update-index --refresh 2>/dev/null
|
||||
git-read-tree -u -m "$orig_head" "$curr_head" ||
|
||||
die "You need to first update your working tree."
|
||||
fi
|
||||
|
|
Загрузка…
Ссылка в новой задаче