Files
git/Documentation
Brian Lyles c282eba2d5 rebase: update --empty=ask to --empty=stop
When git-am(1) got its own `--empty` option in 7c096b8d61 (am: support
--empty=<option> to handle empty patches, 2021-12-09), `stop` was used
instead of `ask`. `stop` is a more accurate term for describing what
really happens, and consistency is good.

Update git-rebase(1) to also use `stop`, while keeping `ask` as a
deprecated synonym. Update the tests to primarily use `stop`, but also
ensure that `ask` is still allowed.

In a future commit, we'll be adding a new `--empty` option for
git-cherry-pick(1) as well, making the consistency even more relevant.

Reported-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Brian Lyles <brianmlyles@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2024-03-25 16:45:40 -07:00
..
2024-03-07 15:59:42 -08:00
2023-10-30 07:09:55 +09:00
2023-11-26 10:07:05 +09:00
2023-06-12 13:52:51 -07:00
2023-10-09 12:06:24 -07:00
2023-10-09 12:06:29 -07:00
2023-11-26 10:07:05 +09:00
2023-12-26 11:06:55 -08:00
2024-02-21 10:02:55 -08:00
2023-10-09 12:06:29 -07:00
2023-06-12 13:52:51 -07:00
2023-06-12 13:52:51 -07:00
2024-01-02 13:51:30 -08:00
2023-10-09 12:06:24 -07:00
2024-03-07 15:59:40 -08:00
2023-10-09 12:06:29 -07:00
2023-12-14 14:38:07 -08:00
2023-12-26 11:06:55 -08:00
2023-08-28 09:16:06 -07:00
2023-11-26 10:07:05 +09:00
2023-12-26 11:06:55 -08:00