diff options
Diffstat (limited to 'Documentation/git-pull.txt')
| -rw-r--r-- | Documentation/git-pull.txt | 4 |
1 files changed, 4 insertions, 0 deletions
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 ------- |