Junio C Hamano 223a1bfb58 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`		2021-10-18 15:47:56 -07:00
..
.gitattributes	completion: mark bash script as LF-only	2017-05-10 13:32:51 +09:00
git-completion.bash	Merge branch 'js/retire-preserve-merges'	2021-10-18 15:47:56 -07:00
git-completion.tcsh	completion: tcsh: Fix regression by drop of wrapper functions	2021-08-18 13:58:27 -07:00
git-completion.zsh	contrib/completion: fix zsh completion regression from 59d85a2a05	2021-06-02 12:49:40 +09:00
git-prompt.sh	git-prompt: work under set -u	2021-05-13 15:50:26 +09:00