On Tue, Aug 12, 2025 at 5:11 AM Karthik Nayak <karthik.188@xxxxxxxxx> wrote: > > Phillip Wood <phillip.wood123@xxxxxxxxx> writes: > > > On 11/08/2025 10:13, Karthik Nayak wrote: > >> "Julia Evans via GitGitGadget" <gitgitgadget@xxxxxxxxx> writes: > >>> + > >>> +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 > >>> +shortcut for `git checkout topic && git rebase master`. > >>> + > >> > >> Nit: now that `git-switch(1)` is no longer experimental, we should start > >> recommending it over `git-checkout(1)` as necessary. So perhaps, we > >> could s/checkout/switch here? > > > > Junio has already expressed a preference for "checkout" here c.f. > > <xmqqldnte6h3.fsf@gitster.g>. I think that is technically correct as > > "topic" can be a commitish and "git switch <object-id>" fails without > > "--detach". Also rebase does not do any of the extra checks that "git > > switch" does before switching branches (I'm not saying that is > > necessarily a good thing). > > > > I missed that, but since we do mention that `topic` is a branch, it > still makes sense to use 'git switch'. But either way this is okay. In the general case, it may not be a branch though. (Of course, that's too confusing a detail for this section anyway.) -- D. Ben Knoble
