mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Documentation: warn prominently against merging with dirty trees

Browse Source 
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>
This commit is contained in:
Thomas Rast
2010-01-07 17:42:27 +01:00
parent 57bddb1153
commit e330d8ca1a
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Documentation/git-merge.txt
View File

@ -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 historical reasons. Do not use it from the command line or in
new scripts. It is the same as `git merge -m <msg> <commit>...`. 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 OPTIONS
------- -------

4
Documentation/git-pull.txt
View File

@ -24,6 +24,10 @@ when merging local branches into the current branch.
Also note that options meant for 'git-pull' itself and underlying Also note that options meant for 'git-pull' itself and underlying
'git-merge' must be given before the options meant for 'git-fetch'. '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 OPTIONS
------- -------