diff options
| author |  Matthieu Moy <Matthieu.Moy@imag.fr> | 2013-06-18 10:42:55 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2013-06-18 09:19:19 -0700 |
| commit | 76b80cdf17807ba4a773562df2218980ffa27e4f (patch) | |
| tree | ca407a1af467416d9d818aedef7a864763b42f01 /list-objects.h | |
| parent | fast-export: fix argument name in error messages (diff) | |
| download | tgif-76b80cdf17807ba4a773562df2218980ffa27e4f.tar.xz | |
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>
Diffstat (limited to 'list-objects.h')
0 files changed, 0 insertions, 0 deletions