diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-01-20 14:42:59 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-20 14:42:59 -0800 |
| commit | 71b3ef11fa0aade4a514c51b83438858a4a3c03b (patch) | |
| tree | 6cea8215ecc0e70c8f19e04c51327deda93672d3 /Documentation | |
| parent | f922df8655675aafaea96f3715c9473c63d2ca47 (diff) | |
| parent | d38a30df7dd54c5c6883af1de1a03ec7d523cee5 (diff) | |
| download | git-71b3ef11fa0aade4a514c51b83438858a4a3c03b.tar.gz git-71b3ef11fa0aade4a514c51b83438858a4a3c03b.tar.xz | |
Merge branch 'mm/conflict-advice'
* mm/conflict-advice:
Be more user-friendly when refusing to do something because of conflict.
Conflicts:
Documentation/config.txt
advice.c
advice.h
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 d4332140a..76c7d9c7e 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -130,6 +130,10 @@ advice.*:: Advice shown when linkgit:git-merge[1] refuses to merge to avoid overwritting local changes. Default: true. + resolveConflict:: + Advices shown by various commands when conflicts + prevent the operation from being performed. + Default: true. implicitIdentity:: Advice on how to set your identity configuration when your information is guessed from the system username and |