git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jim Cromie <jim.cromie@gmail.com>
To: Conrad Irwin <conrad.irwin@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: [feature wishlist] add commit subcommand to git add -i
Date: Sun, 14 Aug 2011 18:43:27 -0600	[thread overview]
Message-ID: <CAJfuBxzseEtSLSupmragyoVbZBS9Cmmd9cabLzpdT+9xiQRbQg@mail.gmail.com> (raw)
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:
> 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

  reply	other threads:[~2011-08-15  0:44 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-08-14  8:38 [feature wishlist] add commit subcommand to git add -i Jim Cromie
2011-08-14  8:48 ` Conrad Irwin
2011-08-15  0:43   ` Jim Cromie [this message]
2011-08-14  8:56 ` Ramkumar Ramachandra
2011-08-15  0:44   ` Jim Cromie
2011-08-15 12:54 ` Thomas Rast

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=CAJfuBxzseEtSLSupmragyoVbZBS9Cmmd9cabLzpdT+9xiQRbQg@mail.gmail.com \
    --to=jim.cromie@gmail.com \
    --cc=conrad.irwin@gmail.com \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).