Jim Meyering <meyering@xxxxxxxxxx> writes: > Let a command-line --keep-subject (-k) override a config-specified > format.numbered (--numbered (-n)), rather than provoking the > "-n and -k are mutually exclusive" failure. > * t4021-format-patch-numbered.sh: Test for the above > --- Sign-off? > Here's a quick demo of the problem: > > $ git config format.numbered true > $ git format-patch --stdout -1 -k > /dev/null > fatal: -n and -k are mutually exclusive. > > This started when a colleague reported that "git rebase master" was failing > with a "fatal: -n and -k are mutually exclusive". Stephen Tweedie discovered > that it was due to the format.numbered=true setting in ~/.gitconfig > conflicting with the -k of the format-patch command run as part of > the rebase operation. Here's a fix. > > Stephen suggested an alternate patch in which rather than adding a > new variable, you'd use "numbered = -1" to indicate that the setting > originated in config. Let me know if you'd prefer that. Some people might find an extra variable redundant or verbose, but I think your approach is easier to follow and to the point, especially with the in-code comment. Thanks. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html