Junio C Hamano 640f9cd599 Merge branch 'dl/rebase-i-keep-base' ... "git rebase --keep-base <upstream>" tries to find the original base of the topic being rebased and rebase on top of that same base, which is useful when running the "git rebase -i" (and its limited variant "git rebase -x"). The command also has learned to fast-forward in more cases where it can instead of replaying to recreate identical commits. * dl/rebase-i-keep-base: rebase: teach rebase --keep-base rebase tests: test linear branch topology rebase: fast-forward --fork-point in more cases rebase: fast-forward --onto in more cases rebase: refactor can_fast_forward into goto tower t3432: test for --no-ff's interaction with fast-forward t3432: distinguish "noop-same" v.s. "work-same" in "same head" tests t3432: test rebase fast-forward behavior t3431: add rebase --fork-point tests		2019-09-30 13:19:31 +09:00
..
.gitattributes	completion: mark bash script as LF-only	2017-05-10 13:32:51 +09:00
git-completion.bash	Merge branch 'dl/rebase-i-keep-base'	2019-09-30 13:19:31 +09:00
git-completion.tcsh	git-completion.tcsh: fix redirect with noclobber	2015-06-09 11:21:15 -07:00
git-completion.zsh	zsh: complete unquoted paths with spaces correctly	2019-01-03 11:48:13 -08:00
git-prompt.sh	git-prompt: improve cherry-pick/revert detection	2019-07-01 12:39:44 -07:00