Skip to content

Commit b27117e

Browse files
committed
doc: git rebase: clarify arguments syntax
I found this extremely hard to understand as it was and this seemed like a clearer wording to me. Signed-off-by: Julia Evans <[email protected]>
1 parent f4f0a5a commit b27117e

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

Documentation/git-rebase.adoc

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,12 +58,10 @@ first problematic commit and leave conflict markers. If this happens, you can:
5858
5959
git rebase --skip
6060
61+
`git rebase <upstream> <branch>` is shorthand for `git switch <branch>`
62+
followed by `git rebase <upstream>`.
6163

62-
If `<branch>` is specified, `git rebase` will perform an automatic
63-
`git switch <branch>` before doing anything else. Otherwise
64-
it remains on the current branch.
65-
66-
If `<upstream>` is not specified, the upstream configured in
64+
If you don't specify an `<upstream>` to rebase onto, the upstream configured in
6765
`branch.<name>.remote` and `branch.<name>.merge` options will be used (see
6866
linkgit:git-config[1] for details) and the `--fork-point` option is
6967
assumed. If you are currently not on any branch or if the current

0 commit comments

Comments
 (0)