mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
Documentation/git-merge.txt: weaken warning about uncommited changes
Commit 35d2fffd
introduced 'git merge --abort' as a synonym to 'git reset
--merge', and added some failing tests in t7611-merge-abort.sh (search
'###' in this file) showing that 'git merge --abort' could not always
recover the pre-merge state.
Still, in many cases, 'git merge --abort' just works, and it is usually
considered that the ability to start a merge with uncommited changes is
an important property of Git.
Weaken the warning by discouraging only merge with /non-trivial/
uncommited changes.
Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
04a74b6cfa
commit
76b80cdf17
|
@ -56,8 +56,8 @@ especially if those changes were further modified after the merge
|
||||||
was started), 'git merge --abort' will in some cases be unable to
|
was started), 'git merge --abort' will in some cases be unable to
|
||||||
reconstruct the original (pre-merge) changes. Therefore:
|
reconstruct the original (pre-merge) changes. Therefore:
|
||||||
|
|
||||||
*Warning*: Running 'git merge' with uncommitted changes is
|
*Warning*: Running 'git merge' with non-trivial uncommitted changes is
|
||||||
discouraged: while possible, it leaves you in a state that is hard to
|
discouraged: while possible, it may leave you in a state that is hard to
|
||||||
back out of in the case of a conflict.
|
back out of in the case of a conflict.
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue