| commit | 33561f517036dd0bcddf319a56fd3488759396e5 | |
| author | Alex Henrie <alexhenrie24@gmail.com> | |
| Sun, 26 Mar 2023 03:06:35 +0000 (25 21:06 -0600) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 27 Mar 2023 16:32:49 +0000 (27 09:32 -0700) | ||
| tree | 74bb429f597fada0028634f877b478276daaa841 | treesnapshot (tar.gz zip) |
| parent | 7e5dcec3ca4dee6d8aedd64f4dba037949f36a67 | commitdiff |
rebase: deprecate --rebase-merges=""
The unusual syntax --rebase-merges="" (that is, --rebase-merges with an
empty string argument) has been an undocumented synonym of
--rebase-merges without an argument. Deprecate that syntax to avoid
confusion when a rebase.rebaseMerges config option is introduced, where
rebase.rebaseMerges="" will be equivalent to --no-rebase-merges.
It is not likely that anyone is actually using this syntax, but just in
case, deprecate the empty string argument instead of dropping support
for it immediately.
Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
The unusual syntax --rebase-merges="" (that is, --rebase-merges with an
empty string argument) has been an undocumented synonym of
--rebase-merges without an argument. Deprecate that syntax to avoid
confusion when a rebase.rebaseMerges config option is introduced, where
rebase.rebaseMerges="" will be equivalent to --no-rebase-merges.
It is not likely that anyone is actually using this syntax, but just in
case, deprecate the empty string argument instead of dropping support
for it immediately.
Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| builtin/rebase.c | diffblobblamehistory |