Re: [feature wishlist] add commit subcommand to git add -i

From: Jim Cromie <jim.cromie@gmail.com>
Date: Aug 15, 2011, 00:43 UTC
Message-ID: <CAJfuBxzseEtSLSupmragyoVbZBS9Cmmd9cabLzpdT+9xiQRbQg@mail.gmail.com>
In-Reply-To: <CAOTq_pvMv6JN_jpQvDsmQTwmMgQK9JzuwXr+VF1T6X4=qf3GsQ@mail.gmail.com>

On Sun, Aug 14, 2011 at 2:48 AM, Conrad Irwin <conrad.irwin@gmail.com> wrote:

Show 17 quoted lines

> On Sun, Aug 14, 2011 at 1:38 AM, Jim Cromie <jim.cromie@gmail.com> wrote:
>> going further, if git rebase -i  had ability to  "back" a fixup patch
>> back to where it should have been, and adjust the intervening patches
>> where conflict would normally happen, that would be awesome.
>> Simplistically, this would just shift the patch 1 step back iteratively,
>> until it wouldnt apply properly, and then --abort, stopping at the last
>> clean rebase.
>>
>> apologies if this is too hair-brained, or already done.
>
> It sounds like you're looking for several git commit
> (-p|--interactive) --fixup <commit>, followed by a git rebase -i
> --autosquash. It's not quite as automatic as you describe, but I think
> that automating it would be pretty hard to do correctly.
>
> Conrad
>

it is indeed similar. in the simple case, I know which patch needs the fixup, and using editor to rearrange the todo-file is straightforward. using --autosquash requires knowing the commit-log message to be fixed, and using it to name the fixup commit, which is doable, but I havent trained myself to do so. I'll give it a try next time..

thanks Jim