projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 57bddb1) | patch
Documentation: warn prominently against merging with dirty trees
authorThomas Rast <trast@student.ethz.ch>
Thu, 7 Jan 2010 16:42:27 +0000 (17:42 +0100)
committerThomas Rast <trast@student.ethz.ch>
Sat, 9 Jan 2010 20:08:26 +0000 (21:08 +0100)
commite330d8ca1a9ec38ce40b0f67123b1dd893f0b31c
treece537194d33e4dd0a93786772e876444321721e6tree | snapshot
parent57bddb115331a23816af772172531fb56fceace4commit | diff
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>
Documentation/git-merge.txt diff | blob | history
Documentation/git-pull.txt diff | blob | history
Git—the stupid content tracker