diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-04-01 20:21:34 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-04-01 20:21:34 (GMT) |
| commit | ac16f55697211ae4ef557706a098b8ed34a7fda6 (patch) | |
| tree | 94753b53005ff0eeb20587b120a595a8746511db /Documentation | |
| parent | 521df686e5a5d445e03280f48df966b77e23f160 (diff) | |
| parent | 37ce97353c5be708ce2f86e176e99b62507332cc (diff) | |
| download | git-ac16f55697211ae4ef557706a098b8ed34a7fda6.zip git-ac16f55697211ae4ef557706a098b8ed34a7fda6.tar.gz git-ac16f55697211ae4ef557706a098b8ed34a7fda6.tar.bz2 | |
Merge branch 'pb/advice-merge-conflict'
Hints that suggest what to do after resolving conflicts can now be
squelched by disabling advice.mergeConflict.
Acked-by: Phillip Wood <phillip.wood123@gmail.com>
cf. <e040c631-42d9-4501-a7b8-046f8dac6309@gmail.com>
* pb/advice-merge-conflict:
builtin/am: allow disabling conflict advice
sequencer: allow disabling conflict advice
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/config/advice.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/config/advice.txt b/Documentation/config/advice.txt index f833411..0e35ae5 100644 --- a/Documentation/config/advice.txt +++ b/Documentation/config/advice.txt @@ -56,6 +56,8 @@ advice.*:: Shown when the user's information is guessed from the system username and domain name, to tell the user how to set their identity configuration. + mergeConflict:: + Shown when various commands stop because of conflicts. nestedTag:: Shown when a user attempts to recursively tag a tag object. pushAlreadyExists:: |