diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-06-15 15:09:28 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-06-15 15:09:28 -0700 |
| commit | 589bc0942b2c14e9361deedc468a233e0571136f (patch) | |
| tree | e79ba07d472d9d7d6d5f14045bce866c2f462f16 /commit.c | |
| parent | bfca6316345ffd717c717d2e36365239a3070124 (diff) | |
| parent | f007713cb101dba76491f18459ae45085b6267a2 (diff) | |
| download | git-589bc0942b2c14e9361deedc468a233e0571136f.tar.gz | |
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
Diffstat (limited to 'commit.c')
0 files changed, 0 insertions, 0 deletions