[PATCH v2 2/4] Documentation: warn prominently against merging with dirty trees
From: Thomas Rast <hidden>
Date: 2016-06-15 22:47:59
Subsystem:
documentation, the rest · Maintainers:
Jonathan Corbet, Linus Torvalds
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 <redacted> --- Documentation/git-merge.txt | 4 ++++ Documentation/git-pull.txt | 4 ++++ 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 -------
--
1.6.6.218.g502b0