]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 521df68 37ce973)
Merge branch 'pb/advice-merge-conflict'
authorJunio C Hamano <gitster@pobox.com>
Mon, 1 Apr 2024 20:21:34 +0000 (13:21 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 1 Apr 2024 20:21:34 +0000 (13:21 -0700)
commitac16f55697211ae4ef557706a098b8ed34a7fda6
tree94753b53005ff0eeb20587b120a595a8746511dbtree | snapshot
parent521df686e5a5d445e03280f48df966b77e23f160commit | diff
parent37ce97353c5be708ce2f86e176e99b62507332cccommit | diff
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
builtin/am.c diff1 | diff2 | blob | history
sequencer.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.