Documentation: warn prominently against merging with dirty trees

diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index 48965870263c8cf1e72339994f1e171384b99eff..3277f4e26dae2ff346842bb1b698d20fd26a373f 100644 (file)
--- a/Documentation/git-merge.txt
+++ b/Documentation/git-merge.txt
@@ -22,6 +22,10 @@ The second syntax (<msg> `HEAD` <commit>...) is supported for
 historical reasons.  Do not use it from the command line or in
 new scripts.  It is the same as `git merge -m <msg> <commit>...`.
 
+*Warning*: Running 'git-merge' with uncommitted changes is
+discouraged: while possible, it leaves you in a state that is hard to
+back out of in the case of a conflict.
+
 
 OPTIONS
 -------