Subject: [PATCH v4 0/5] doc: git-rebase: clarify DESCRIPTION section

From: "Julia Evans via GitGitGadget" <[email-masked]>
Date: Sat, 09 Aug 2025 01:14:12 +0000

Replaced git switch topic && git rebase master with git checkout topic &&
git rebase master

Also "short-cut" with "shortcut" which is the spelling used elsewhere in the
man pages

Julia Evans (5):
  doc: git-rebase: start with an example
  doc: git rebase: dedup merge conflict discussion
  doc: git rebase: clarify arguments syntax
  doc: git-rebase: move --onto explanation down
  doc: git-rebase: update discussion of internals

 Documentation/git-rebase.adoc | 300 ++++++++++++++++------------------
 1 file changed, 145 insertions(+), 155 deletions(-)

base-commit: 2c2ba49d55ff26c1082b8137b1ec5eeccb4337d1
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-1949%2Fjvns%2Fclarify-rebase-v4
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1949/jvns/clarify-rebase-v4
Pull-Request: https://github.com/gitgitgadget/git/pull/1949

Range-diff vs v3:

 1:  26b742eb49f ! 1:  07a4bdb7ce5 doc: git-rebase: start with an example
     @@ Documentation/git-rebase.adoc: SYNOPSIS
      +`master` (i.e. A, B, and C), on top of the current `master`.  You can do this
      +by running `git rebase master` while the `topic` branch is checked out.  If you
      +want to rebase `topic` while on another branch, `git rebase master topic` is a
     -+short-cut for `git switch topic && git rebase master`.
     ++shortcut for `git checkout topic && git rebase master`.
      +
      +------------
      +                  A'--B'--C' topic
 2:  249a5127904 ! 2:  061790686b9 doc: git rebase: dedup merge conflict discussion
     @@ Commit message
          Signed-off-by: Julia Evans <[email-masked]>
      
       ## Documentation/git-rebase.adoc ##
     -@@ Documentation/git-rebase.adoc: short-cut for `git switch topic && git rebase master`.
     +@@ Documentation/git-rebase.adoc: shortcut for `git checkout topic && git rebase master`.
           D---E---F---G master
       ------------
       
 3:  013a5044ef3 = 3:  fe9e161a51b doc: git rebase: clarify arguments syntax
 4:  c574a27412d = 4:  b37ebc8389d doc: git-rebase: move --onto explanation down
 5:  eabacd3c159 = 5:  105a65e6e71 doc: git-rebase: update discussion of internals

-- 
gitgitgadget