Johannes Schindelin 1131ec9818 pull: accept --rebase=merges to recreate the branch topology ... Similar to the `preserve` mode simply passing the `--preserve-merges` option to the `rebase` command, the `merges` mode simply passes the `--rebase-merges` option. This will allow users to conveniently rebase non-trivial commit topologies when pulling new commits, without flattening them. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>		2018-04-26 12:28:43 +09:00
..
.gitattributes	completion: mark bash script as LF-only	2017-05-10 13:32:51 +09:00
git-completion.bash	pull: accept --rebase=merges to recreate the branch topology	2018-04-26 12:28:43 +09:00
git-completion.tcsh	git-completion.tcsh: fix redirect with noclobber	2015-06-09 11:21:15 -07:00
git-completion.zsh	completion: fill COMPREPLY directly when completing refs	2017-03-23 11:18:22 -07:00
git-prompt.sh	git-prompt: fix reading files with windows line endings	2017-12-06 10:08:13 -08:00