Re: [PATCH v2 1/2] sequencer: allow disabling conflict advice
From: Kristoffer Haugsbakk <hidden>
Date: 2024-03-11 10:29:37
Hi Philippe On Sun, Mar 10, 2024, at 20:51, Philippe Blain via GitGitGadget wrote:
quoted hunk ↗ jump to hunk
diff --git a/Documentation/config/advice.txtb/Documentation/config/advice.txt index c7ea70f2e2e..a1178284b23 100644--- a/Documentation/config/advice.txt +++ b/Documentation/config/advice.txt@@ -56,6 +56,8 @@ advice.*:: Advice on how to set your identity configuration when your information is guessed from the system username and domain name. + mergeConflict:: + Advice shown when various commands stop because of conflicts.
Given that topic kh/branch-ref-syntax-advice is in `next`, maybe this should be changed to “Shown when”?[1] 🔗 1: https://lore.kernel.org/git/7017ff3fff773412e8c472d8e59a132b0e8faae7.1709670287.git.code@khaugsbakk.name/ (local)
nestedTag:: Advice shown if a user attempts to recursively tag a tag object. pushAlreadyExists::