Re: [PATCH v5 0/8][Outreachy] rebase -i: add options to fixup command

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Sat, 6 Feb 2021 at 00:43, Junio C Hamano <gitster@xxxxxxxxx> wrote:
[...]
> Correct, except that it shouldn't be on top of the 'next' branch.
>
> Please "git log --first-parent --oneline master..next" to find the
> tip of what got merged, and build on top of that instead.  I.e.
>
>     $ git show -s --oneline \
>         "origin/next^{/ branch 'cm/rebase-i' into }"
>     4f9aa6cec3 Merge branch 'cm/rebase-i' into next
>     $ git checkout -b my-follow-up-topic 4f9aa6cec3^2
>     ... work work work ...
>
> That is what we mean by "after getting merged to 'next', the topic
> gets polished incrementally".
>
> Alternatively, you can have branches from the broken-out repository
> handy, e.g.
>
>     $ git remote add brokenout https://github.com/gitster/git
>
> and you'd find the topic as I see it like so:
>
>     $ git fetch brokenout
>     $ git log --oneline brokenout/master..brokenout/cm/rebase-i
>

Got it, thanks all for guiding. I will update soon.

Thanks and Regards,
Charvi



[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]

  Powered by Linux