Junio C Hamano
2c6e5b32aa
Merge branch 'en/rebase-incompatible-opts'
...
"git rebase" often ignored incompatible options instead of
complaining, which has been corrected.
* en/rebase-incompatible-opts:
rebase: provide better error message for apply options vs. merge config
rebase: put rebase_options initialization in single place
rebase: fix formatting of rebase --reapply-cherry-picks option in docs
rebase: clarify the OPT_CMDMODE incompatibilities
rebase: add coverage of other incompatible options
rebase: fix incompatiblity checks for --[no-]reapply-cherry-picks
rebase: fix docs about incompatibilities with --root
rebase: remove --allow-empty-message from incompatible opts
rebase: flag --apply and --merge as incompatible
rebase: mark --update-refs as requiring the merge backend
2023-02-03 16:08:21 -08:00
..
2022-12-26 11:42:05 +09:00
2023-01-21 17:21:58 -08:00
2022-08-19 11:13:14 -07:00
2023-01-13 14:17:14 -08:00
2022-10-13 09:32:57 -07:00
2022-12-19 11:46:18 +09:00
2022-11-21 12:32:48 +09:00
2023-01-05 15:07:22 +09:00
2023-01-05 15:07:17 +09:00
2023-01-14 08:49:55 -08:00
2022-11-21 12:06:15 +09:00
2022-07-01 11:43:42 -07:00
2022-11-21 12:06:15 +09:00
2023-01-08 10:28:34 +09:00
2022-11-21 12:06:15 +09:00
2023-01-02 21:37:18 +09:00
2022-10-28 11:26:54 -07:00
2022-10-13 09:32:57 -07:00
2022-12-14 15:55:46 +09:00
2022-11-21 12:32:48 +09:00
2022-10-13 09:32:57 -07:00
2022-11-21 12:06:15 +09:00
2022-10-28 11:26:54 -07:00
2022-11-21 12:06:15 +09:00
2022-11-21 12:06:15 +09:00
2022-11-21 12:06:15 +09:00
2022-12-14 15:55:46 +09:00
2023-01-17 14:32:06 -08:00
2022-12-13 22:16:23 +09:00
2022-09-01 10:49:48 -07:00
2022-09-12 08:38:59 -07:00
2023-01-19 14:41:48 -08:00
2022-11-14 22:39:25 -05:00
2022-11-21 12:06:15 +09:00
2022-12-19 11:46:17 +09:00
2022-11-23 11:22:24 +09:00
2022-11-21 12:06:14 +09:00
2023-01-27 08:51:41 -08:00
2022-10-28 11:26:54 -07:00
2022-08-19 11:13:15 -07:00
2022-06-17 10:38:26 -07:00
2022-10-13 09:32:57 -07:00
2022-10-13 09:32:57 -07:00
2023-01-23 13:39:52 -08:00
2022-11-21 12:32:48 +09:00
2022-10-13 09:32:56 -07:00
2023-01-23 13:39:50 -08:00
2022-05-20 15:26:59 -07:00
2022-10-13 09:32:56 -07:00
2022-07-01 11:43:43 -07:00
2022-11-21 12:06:15 +09:00
2022-11-21 12:06:15 +09:00
2022-12-26 11:42:05 +09:00
2023-01-13 10:24:57 -08:00
2022-06-21 10:12:15 -07:00
2022-10-06 09:56:51 -07:00
2022-11-21 12:06:15 +09:00
2022-09-01 10:49:48 -07:00
2022-11-16 14:57:32 -05:00
2023-01-14 08:49:55 -08:00
2022-10-13 09:32:56 -07:00
2022-10-13 09:32:56 -07:00
2022-10-24 15:44:20 -07:00
2022-11-21 15:58:54 +09:00
2022-11-21 12:06:15 +09:00
2022-11-14 16:55:50 -05:00
2022-12-02 08:25:29 +09:00
2022-12-26 10:21:44 +09:00
2023-01-25 09:20:53 -08:00
2022-11-17 16:22:52 -05:00
2022-09-19 11:11:11 -07:00
2023-01-08 10:34:37 +09:00
2023-01-08 10:34:35 +09:00
2022-11-08 17:15:12 -05:00
2022-12-14 15:55:46 +09:00
2022-08-05 14:13:12 -07:00
2022-12-13 22:16:23 +09:00
2022-12-26 11:42:05 +09:00
2022-11-23 11:22:25 +09:00
2022-12-14 15:55:46 +09:00
2022-12-14 15:55:46 +09:00
2022-12-26 10:21:43 +09:00
2022-10-13 09:32:56 -07:00
2022-10-24 14:48:05 -07:00
2022-10-28 11:26:54 -07:00
2022-10-28 11:26:54 -07:00
2023-01-17 14:32:06 -08:00
2023-01-17 14:32:06 -08:00
2023-01-08 10:28:34 +09:00
2022-10-28 11:26:54 -07:00
2022-10-13 09:32:56 -07:00
2022-11-21 12:32:48 +09:00
2022-06-13 10:22:36 -07:00
2022-11-21 12:06:15 +09:00
2022-10-13 09:32:56 -07:00
2022-10-13 09:32:56 -07:00
2022-10-13 09:32:56 -07:00
2022-12-18 11:48:26 +09:00
2022-10-13 09:32:56 -07:00
2022-10-13 09:32:56 -07:00
2022-10-13 09:32:56 -07:00
2023-01-17 14:32:06 -08:00