diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-06-08 14:27:52 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-06-08 14:27:52 -0700 |
| commit | 363d54ff806097ee01ad0614dda950d0ca88987c (patch) | |
| tree | 2b077c184f3c80b7afa44cad7cdea25f887c320a /Documentation | |
| parent | d777ef9befe7cdf595981686954427d8cd6e4c4c (diff) | |
| parent | 9e5ebe9668a0f152757182b80bae9b66aad11952 (diff) | |
| download | git-363d54ff806097ee01ad0614dda950d0ca88987c.tar.xz | |
Merge branch 'ah/rebase-keep-base-fix' into maint
"git rebase --keep-base <upstream> <branch-to-rebase>" computed the
commit to rebase onto incorrectly, which has been corrected.
source: <20220421044233.894255-1-alexhenrie24@gmail.com>
* ah/rebase-keep-base-fix:
rebase: use correct base for --keep-base when a branch is given
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-rebase.txt | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index 9da4647061..262fb01aec 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@ -215,9 +215,10 @@ leave out at most one of A and B, in which case it defaults to HEAD. --keep-base:: Set the starting point at which to create the new commits to the - merge base of <upstream> <branch>. Running + merge base of <upstream> and <branch>. Running 'git rebase --keep-base <upstream> <branch>' is equivalent to - running 'git rebase --onto <upstream>... <upstream>'. + running + 'git rebase --onto <upstream>...<branch> <upstream> <branch>'. + This option is useful in the case where one is developing a feature on top of an upstream branch. While the feature is being worked on, the |