summaryrefslogtreecommitdiff
path: root/midx.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2021-10-18 15:47:56 -0700
committerJunio C Hamano <gitster@pobox.com>2021-10-18 15:47:56 -0700
commit223a1bfb5821387981c700654e4edd2443c5a7fc (patch)
treeae4464af9b68e958f7c7991bce7a96f515054487 /midx.h
parent0ef08090d2a391e0ce037eafd2b391e3f76b1060 (diff)
parent17919c3585ba9df9c65ea4a5f7300543dfba5f9f (diff)
downloadgit-223a1bfb5821387981c700654e4edd2443c5a7fc.tar.gz
Merge branch 'js/retire-preserve-merges'
The "--preserve-merges" option of "git rebase" has been removed. * js/retire-preserve-merges: sequencer: restrict scope of a formerly public function rebase: remove a no-longer-used function rebase: stop mentioning the -p option in comments rebase: remove obsolete code comment rebase: drop the internal `rebase--interactive` command git-svn: drop support for `--preserve-merges` rebase: drop support for `--preserve-merges` pull: remove support for `--rebase=preserve` tests: stop testing `git rebase --preserve-merges` remote: warn about unhandled branch.<name>.rebase values t5520: do not use `pull.rebase=preserve`
Diffstat (limited to 'midx.h')
0 files changed, 0 insertions, 0 deletions