Documentation: warn prominently against merging with dirty trees
We do this for both git-merge and git-pull, so as to hopefully alert (over)users of git-pull to the issue. Signed-off-by: Thomas Rast <trast@student.ethz.ch>
Thomas Rast committed
Jan 7, 2010 at 17:42 UTC
e330d8ca1a9ec38ce40b0f67123b1dd893f0b31c
2 files changed
+8
Documentation/git-merge.txt
+4
@@ -22,6 +22,10 @@ The second syntax (<msg> `HEAD` <commit>...) is supported for
22
historical reasons. Do not use it from the command line or in
23
new scripts. It is the same as `git merge -m <msg> <commit>...`.
24
25
+*Warning*: Running 'git-merge' with uncommitted changes is
26
+discouraged: while possible, it leaves you in a state that is hard to
27
+back out of in the case of a conflict.
28
+
29
30
OPTIONS
31
-------
Documentation/git-pull.txt
+4
@@ -24,6 +24,10 @@ when merging local branches into the current branch.
24
Also note that options meant for 'git-pull' itself and underlying
25
'git-merge' must be given before the options meant for 'git-fetch'.
26
27
+*Warning*: Running 'git-pull' (actually, the underlying 'git-merge')
28
+with uncommitted changes is discouraged: while possible, it leaves you
29
+in a state that is hard to back out of in the case of a conflict.
30
+
31
OPTIONS
32
-------
33