diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-05-11 15:16:09 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-05-11 15:16:09 -0700 |
| commit | 27d3c17733fa8f10acf11076634fe9f11bb955a0 (patch) | |
| tree | 5f12d01b82044fbb02eeb7d0339e709bda04350f /git-rebase.txt | |
| parent | 84d4cc0f4680776dd97a47c94542f687016d6969 (diff) | |
| download | git-htmldocs-27d3c17733fa8f10acf11076634fe9f11bb955a0.tar.gz | |
Autogenerated HTML docs for v2.36.1-74-g277cf0
Diffstat (limited to 'git-rebase.txt')
| -rw-r--r-- | git-rebase.txt | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/git-rebase.txt b/git-rebase.txt index 9da464706..262fb01ae 100644 --- a/git-rebase.txt +++ b/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 |