Re: [PATCH v2 1/5] doc: git-rebase: start with an example
"Julia Evans via GitGitGadget" <gitgitgadget@gmail.com> writes:
Show 16 quoted lines
> +Transplant a series of commits onto a different starting point.
> +
> +For example, imagine that you have been working on the `topic` branch in this
> +history, and you want to "catch up" to the work done on the `master` branch.
> +
> +------------
> + A---B---C topic
> + /
> + D---E---F---G master
> +------------
> +
> +You want to transplant the commits you made on `topic` since it diverged from
> +`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`.
s/switch/checkout/, as that is how the original defines the short-cut.
Show 6 quoted lines
> +------------
> + A'--B'--C' topic
> + /
> + D---E---F---G master
> +------------
> +
Other than that, looks great.
Junio C Hamano <gitster@pobox.com>