]> git.ipfire.org Git - thirdparty/git.git/commit
rebase: hide --preserve-merges option
authorDenton Liu <liu.denton@gmail.com>
Fri, 18 Oct 2019 23:55:56 +0000 (16:55 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 21 Oct 2019 03:03:49 +0000 (12:03 +0900)
commitfeebd2d256adffa6a1e31832266ee9466a63c0c2
tree747ece9e943e3ebaa9999c68f048512d3732a7b7
parent7948b49ac7be06dd926b5a86e70f7f40f3041899
rebase: hide --preserve-merges option

Since --preserve-merges has been deprecated in favour of
--rebase-merges, mark this option as hidden so it no longer shows up in
the usage and completions.

Signed-off-by: Denton Liu <liu.denton@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/rebase.c