summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Rast <trast@student.ethz.ch>2010-01-07 16:42:27 (GMT)
committerThomas Rast <trast@student.ethz.ch>2010-01-09 20:08:26 (GMT)
commite330d8ca1a9ec38ce40b0f67123b1dd893f0b31c (patch)
treece537194d33e4dd0a93786772e876444321721e6
parent57bddb115331a23816af772172531fb56fceace4 (diff)
downloadgit-e330d8ca1a9ec38ce40b0f67123b1dd893f0b31c.zip
git-e330d8ca1a9ec38ce40b0f67123b1dd893f0b31c.tar.gz
git-e330d8ca1a9ec38ce40b0f67123b1dd893f0b31c.tar.bz2
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>
-rw-r--r--Documentation/git-merge.txt4
-rw-r--r--Documentation/git-pull.txt4
2 files changed, 8 insertions, 0 deletions
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index 4896587..3277f4e 100644
--- 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
-------
diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt
index b932011..b3fa312 100644
--- a/Documentation/git-pull.txt
+++ b/Documentation/git-pull.txt
@@ -24,6 +24,10 @@ when merging local branches into the current branch.
Also note that options meant for 'git-pull' itself and underlying
'git-merge' must be given before the options meant for 'git-fetch'.
+*Warning*: Running 'git-pull' (actually, the underlying '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
-------