diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-11-24 09:31:51 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-11-24 09:31:51 +0300 |
| commit | 444e10df2a4159b5dd2975feadbb9e1213d65b47 (patch) | |
| tree | e0d4c7715d74c457f063c1b12105cf77cec60dae /Documentation/config.txt | |
| parent | e61f25f3a6bb5dcbb5ae5f8b4ad26c308982373c (diff) | |
| parent | e63ec003b2a0c89f0c1cbc4862dcef7c4a14a785 (diff) | |
Merge branch 'mm/maint-hint-failed-merge'
* mm/maint-hint-failed-merge:
user-manual: Document that "git merge" doesn't like uncommited changes.
merge-recursive: point the user to commit when file would be overwritten.
Diffstat (limited to 'Documentation/config.txt')
| -rw-r--r-- | Documentation/config.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 657f0016d3..a8e0876a2a 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -126,6 +126,10 @@ advice.*:: Directions on how to stage/unstage/add shown in the output of linkgit:git-status[1] and the template shown when writing commit messages. Default: true. + commitBeforeMerge:: + Advice shown when linkgit:git-merge[1] refuses to + merge to avoid overwritting local changes. + Default: true. -- core.fileMode:: |