From: Julia Evans via GitGitGadget Date: Fri, 08 Aug 2025 15:24:23 GMT Subject: [PATCH 3/5] doc: git rebase: clarify arguments syntax Message-ID: In-Reply-To: From: Julia Evans I found this extremely hard to understand as it was and this seemed like a clearer wording to me. Signed-off-by: Julia Evans --- 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 ` is shorthand for `git switch ` +followed by `git rebase `. -If `` is specified, `git rebase` will perform an automatic -`git switch ` before doing anything else. Otherwise -it remains on the current branch. - -If `` is not specified, the upstream configured in +If you don't specify an `` to rebase onto, the upstream configured in `branch..remote` and `branch..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