[PATCH 3/5] doc: git rebase: clarify arguments syntax
- From
Julia Evans via GitGitGadget <gitgitgadget@gmail.com>
- Date
- Aug 8, 2025, 15:24 UTC
- Message-ID
- <b27117ea19a41ec544d3e721e3a188ceb6efbedd.1754666665.git.gitgitgadget@gmail.com>
- In-Reply-To
- <pull.1949.git.1754666665.gitgitgadget@gmail.com>
From: Julia Evans <julia@jvns.ca>
I found this extremely hard to understand as it was and this seemed like a clearer wording to me.
Signed-off-by: Julia Evans <julia@jvns.ca> --- Documentation/git-rebase.adoc | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/Documentation/git-rebase.adoc b/Documentation/git-rebase.adoc index 3087e558b509..ada9f6b2614b 100644 --- a/Documentation/git-rebase.adoc +++ b/Documentation/git-rebase.adoc @@ -58,12 +58,10 @@ first problematic commit and leave conflict markers. If this happens, you can: git rebase --skip +`git rebase <upstream> <branch>` is shorthand for `git switch <branch>` +followed by `git rebase <upstream>`. -If `<branch>` is specified, `git rebase` will perform an automatic -`git switch <branch>` before doing anything else. Otherwise -it remains on the current branch. - -If `<upstream>` is not specified, the upstream configured in +If you don't specify an `<upstream>` to rebase onto, the upstream configured in `branch.<name>.remote` and `branch.<name>.merge` options will be used (see linkgit:git-config[1] for details) and the `--fork-point` option is assumed. If you are currently not on any branch or if the current
-- gitgitgadget