diff options
| author | Thomas Rast <trast@student.ethz.ch> | 2010-01-07 17:42:27 +0100 |
|---|---|---|
| committer | Thomas Rast <trast@student.ethz.ch> | 2010-01-09 21:08:26 +0100 |
| commit | e330d8ca1a9ec38ce40b0f67123b1dd893f0b31c (patch) | |
| tree | ce537194d33e4dd0a93786772e876444321721e6 | |
| parent | 57bddb115331a23816af772172531fb56fceace4 (diff) | |
| download | git-e330d8ca1a9ec38ce40b0f67123b1dd893f0b31c.tar.gz git-e330d8ca1a9ec38ce40b0f67123b1dd893f0b31c.tar.xz | |
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.txt | 4 | ||||
| -rw-r--r-- | 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 489658702..3277f4e26 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 b93201158..b3fa312d7 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 ------- |