On Fri, Jul 27, 2018 at 10:34:20AM -0700, Junio C Hamano wrote:
> Jeff King writes:
>
> >> $ git rebase --onto HEAD @{-1}~3 @{-1}^0
> >
> > Interesting. I'd have probably done it with an interactive rebase:
> >
> > $ git rebase -i HEAD~4
> > [change first "pick" to "edit"; after
Jeff King writes:
>> $ git rebase --onto HEAD @{-1}~3 @{-1}^0
>
> Interesting. I'd have probably done it with an interactive rebase:
>
> $ git rebase -i HEAD~4
> [change first "pick" to "edit"; after stopping...]
> $ git reset --hard HEAD^ ;# throw away patch 1
> $ git am -s mbox
On Thu, Jul 26, 2018 at 10:33:27AM -0700, Junio C Hamano wrote:
> Jeff King writes:
>
> > So here's a replacement for just patch 1 (I'm assuming this creates less
> > work than re-posting them all, but it may not be if Junio prefers
> > dealing with a whole new mbox rather than a "rebase -i",
Jeff King writes:
> So here's a replacement for just patch 1 (I'm assuming this creates less
> work than re-posting them all, but it may not be if Junio prefers
> dealing with a whole new mbox rather than a "rebase -i", "reset --hard
> HEAD^", "git am" -- let me know if you'd prefer it the other
On Thu, Jul 26, 2018 at 02:58:40AM -0400, Jeff King wrote:
> On Tue, Jul 24, 2018 at 01:20:58PM -0400, Eric Sunshine wrote:
>
> > On Tue, Jul 24, 2018 at 5:26 AM Jeff King wrote:
> > > 1. We'll only trigger with -Wimplicit-function-declaration
> > > (and only stop compilation with
5 matches
Mail list logo