| commit | 76b80cdf17807ba4a773562df2218980ffa27e4f | |
| author | Matthieu Moy <Matthieu.Moy@imag.fr> | |
| Tue, 18 Jun 2013 08:42:55 +0000 (18 10:42 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 18 Jun 2013 16:19:19 +0000 (18 09:19 -0700) | ||
| tree | ca407a1af467416d9d818aedef7a864763b42f01 | treesnapshot (tar.gz zip) |
| parent | 04a74b6cfa5ef4870263f84ac94a488d9f2ef14a | commitdiff |
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>
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>
| Documentation/git-merge.txt | diffblobblamehistory |