| commit | eddfcd8eced9b9f840491064b35a3956f959fd12 | |
| author | Elijah Newren <newren@gmail.com> | |
| Wed, 25 Jan 2023 04:03:54 +0000 (25 04:03 +0000) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 25 Jan 2023 17:20:53 +0000 (25 09:20 -0800) | ||
| tree | 84990d250d650d3fa0c630b7524d0ed911fe2ea9 | treesnapshot (tar.gz zip) |
| parent | 3dc55b2087f1207911e6142c5082e4b06e6c9cbf | commitdiff |
rebase: provide better error message for apply options vs. merge config
When config which selects the merge backend (currently,
rebase.autosquash=true or rebase.updateRefs=true) conflicts with other
options on the command line (such as --whitespace=fix), make the error
message specifically call out the config option and specify how to
override that config option on the command line.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
When config which selects the merge backend (currently,
rebase.autosquash=true or rebase.updateRefs=true) conflicts with other
options on the command line (such as --whitespace=fix), make the error
message specifically call out the config option and specify how to
override that config option on the command line.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| Documentation/git-rebase.txt | diffblobblamehistory | |
| builtin/rebase.c | diffblobblamehistory | |
| t/t3422-rebase-incompatible-options.sh | diffblobblamehistory |