| commit | e330d8ca1a9ec38ce40b0f67123b1dd893f0b31c | |
| author | Thomas Rast <trast@student.ethz.ch> | |
| Thu, 7 Jan 2010 16:42:27 +0000 (7 17:42 +0100) | ||
| committer | Thomas Rast <trast@student.ethz.ch> | |
| Sat, 9 Jan 2010 20:08:26 +0000 (9 21:08 +0100) | ||
| tree | ce537194d33e4dd0a93786772e876444321721e6 | treesnapshot (tar.gz zip) |
| parent | 57bddb115331a23816af772172531fb56fceace4 | commitdiff |
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>
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>
| Documentation/git-merge.txt | diffblobblamehistory | |
| Documentation/git-pull.txt | diffblobblamehistory |