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>
Matthieu Moy committed
Jun 18, 2013 at 10:42 UTC
76b80cdf17807ba4a773562df2218980ffa27e4f
1 file changed
+2
-2
Documentation/git-merge.txt
+2
-2
@@ -56,8 +56,8 @@ especially if those changes were further modified after the merge
56
was started), 'git merge --abort' will in some cases be unable to
57
reconstruct the original (pre-merge) changes. Therefore:
58
59
-*Warning*: Running 'git merge' with uncommitted changes is
60
-discouraged: while possible, it leaves you in a state that is hard to
59
+*Warning*: Running 'git merge' with non-trivial uncommitted changes is
60
+discouraged: while possible, it may leave you in a state that is hard to
61
back out of in the case of a conflict.
62
63