"Philippe Blain via GitGitGadget" <gitgitgadget@xxxxxxxxx> writes: > This series introduces a new config 'advice.mergeConflict' and uses it to > allow disabling the advice shown when 'git rebase', 'git cherry-pick', 'git > revert', 'git rebase --apply' and 'git am' stop because of conflicts. > > Thanks everyone for the reviews! > > Changes since v2: > > * expanded the commit messages to explain why the tests for 'git rebase' do > not need to be adjusted > * adjusted the wording of the new 'advice.mergeConflict' in the doc, as > suggested by Kristoffer for uniformity with his series which is already > merged to 'master' (b09a8839a4 (Merge branch > 'kh/branch-ref-syntax-advice', 2024-03-15)). > * checked all new output manually and consequently adjusted the code in 1/2 > to avoid a lonely 'hint: ' line. > * adjusted the addition in advice.h in 1/2 to put the new enum > alphabetically, as noticed by Rubén. > * added misssing newlines in 2/2 as noticed by Phillip and tweaked by > Junio. > * rebased on master (2953d95d40 (The eighth batch, 2024-03-15)), to avoid > conflicts in 'Documentation/config/advice.txt' due to Kristoffer's merged > series Looking good; will queue. Thanks.
