summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-09-30 04:19:31 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-09-30 04:19:31 (GMT)
commit640f9cd5994ed2061405aa94972b1746bb0c393e (patch)
treef86716f11cea9808256bb3be914d92b52fc1c1e3 /contrib
parent026428c35eb7e4018de3707a08a7dc3d23a69712 (diff)
parent414d924beb41b9f39744b5574231856d5ffbcba8 (diff)
downloadgit-640f9cd5994ed2061405aa94972b1746bb0c393e.zip
git-640f9cd5994ed2061405aa94972b1746bb0c393e.tar.gz
git-640f9cd5994ed2061405aa94972b1746bb0c393e.tar.bz2
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
Diffstat (limited to 'contrib')
-rw-r--r--contrib/completion/git-completion.bash2
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 6f7b4f9..59cd3e8 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -2043,7 +2043,7 @@ _git_rebase ()
--autosquash --no-autosquash
--fork-point --no-fork-point
--autostash --no-autostash
- --verify --no-verify
+ --verify --no-verify --keep-base
--keep-empty --root --force-rebase --no-ff
--rerere-autoupdate
--exec