Files
git/builtin
Junio C Hamano 589bc0942b Merge branch 'po/rebase-preserve-merges'
Various error messages that talk about the removal of
"--preserve-merges" in "rebase" have been strengthened, and "rebase
--abort" learned to get out of a state that was left by an earlier
use of the option.

* po/rebase-preserve-merges:
  rebase: translate a die(preserve-merges) message
  rebase: note `preserve` merges may be a pull config option
  rebase: help users when dying with `preserve-merges`
  rebase.c: state preserve-merges has been removed
2022-06-15 15:09:28 -07:00
..
2022-06-07 14:10:56 -07:00
2022-04-06 09:42:14 -07:00
2022-02-17 16:25:05 -08:00
2021-10-28 09:57:09 -07:00
2022-04-04 10:56:23 -07:00
2022-06-03 14:30:37 -07:00
2022-03-09 13:38:24 -08:00
2022-06-07 14:10:56 -07:00
2022-04-06 15:21:59 -07:00
2021-04-14 13:47:21 -07:00
2021-09-28 10:31:02 -07:00
2022-06-10 15:04:15 -07:00
2022-06-03 14:30:37 -07:00
2022-01-10 11:52:56 -08:00
2022-06-10 15:04:13 -07:00
2022-06-03 14:30:34 -07:00
2021-11-03 13:25:36 -07:00