diff options
| author | Matthieu Moy <Matthieu.Moy@imag.fr> | 2009-11-22 23:26:17 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-11-22 16:07:27 -0800 |
| commit | 4c371f91270792791f867d15f25b03f800ab35a1 (patch) | |
| tree | 8ca2bd7efa1e7801039ed90faeb13706d235b492 /Documentation | |
| parent | 78d553b7d7b269bb22ebd8b1198657c37484a3a0 (diff) | |
| download | git-4c371f91270792791f867d15f25b03f800ab35a1.tar.gz git-4c371f91270792791f867d15f25b03f800ab35a1.tar.xz | |
merge-recursive: point the user to commit when file would be overwritten.
The commit-before-pull is well accepted in the DVCS community, but is
confusing some new users. This should get them back in the right way when
the problem occurs.
Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
| -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 cd1781498..0b550dc49 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:: |