diff options
| author | Elijah Newren <newren@gmail.com> | 2023-01-25 04:03:54 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-01-25 09:20:53 -0800 |
| commit | eddfcd8eced9b9f840491064b35a3956f959fd12 (patch) | |
| tree | 84990d250d650d3fa0c630b7524d0ed911fe2ea9 /Documentation/git-rebase.txt | |
| parent | 3dc55b2087f1207911e6142c5082e4b06e6c9cbf (diff) | |
| download | git-eddfcd8eced9b9f840491064b35a3956f959fd12.tar.gz | |
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>
Diffstat (limited to 'Documentation/git-rebase.txt')
| -rw-r--r-- | Documentation/git-rebase.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index 99aadac28e..9a295bcee4 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@ -648,7 +648,7 @@ are incompatible with the following options: * --merge * --strategy * --strategy-option - * --[no-]autosquash + * --autosquash * --rebase-merges * --interactive * --exec |