diff options
| author |  Denton Liu <liu.denton@gmail.com> | 2019-10-18 16:55:56 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2019-10-21 12:03:49 +0900 |
| commit | feebd2d256adffa6a1e31832266ee9466a63c0c2 (patch) | |
| tree | 747ece9e943e3ebaa9999c68f048512d3732a7b7 /t/t7610-mergetool.sh | |
| parent | rebase docs: recommend `-r` over `-p` (diff) | |
| download | tgif-feebd2d256adffa6a1e31832266ee9466a63c0c2.tar.xz | |
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>
Diffstat (limited to 't/t7610-mergetool.sh')
0 files changed, 0 insertions, 0 deletions