Skip to content

Commit df3d485

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 a6e77a0 commit df3d485

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
@@ -59,12 +59,10 @@ one of these things:
5959
6060
git rebase --skip
6161
62+
`git rebase <upstream> <branch>` is shorthand for `git switch <branch>`
63+
followed by `git rebase <upstream>`.
6264

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

0 commit comments

Comments
 (0)