[PATCH 0/6] Re: Documentation: warn prominently against merging with dirty trees

Jonathan Nieder wrote:

Junio C Hamano wrote:

quoted

You need to be able to tell the two ways in which a "mergy" operation can
"fail" apart [*1*].

Thanks for bringing this up.  The manual does not emphasize that
point at all, but it should.

Maybe something like this (patch 4) could help.  This should pass
through Thomas’s tree to avoid conflicts with his other changes; but
of course, I would be glad to hear any thoughts you have before then.

Jonathan Nieder (6):
  Documentation: clarify one-line description for merge
  Documentation: merge: add an overview
  Documentation: merge: move configuration section to the end
  Documentation: emphasize when git merge terminates early
  Documentation: merge: add a section about fast-forward
  Documentation: merge: tweak HOW MERGE WORKS section

 Documentation/git-merge.txt |  149 ++++++++++++++++++++++++++----------------
 1 files changed, 92 insertions(+), 57 deletions(-)