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

From: Ramkumar Ramachandra <artagnon@gmail.com>
Date: Aug 14, 2011, 08:56 UTC
Message-ID: <CALkWK0=9sT6wDwoa3vDF1bt1e8AiubwW42-o=c++MpzV47LhQg@mail.gmail.com>
In-Reply-To: <CAJfuBxwW8Dyp8FTS13uPOBKZGL9JOEqaSOhGN+zBJ_8BHpJE3g@mail.gmail.com>

Hi Jim,

Jim Cromie writes:

> when using git add -i, it would be handy to have a [c]ommit option.

I can't personally comment on this because I use Magit for staging/ unstaging and committing. It's quite an awesome application- do check it out if you use Emacs.

Show 6 quoted lines

> 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.

Hm, I'm not sure if I understand fully: is the idea about moving a commit backwards iteratively so we have to resolve several simpler and smaller conflicts? I have to admit that I work around this problem by running 'rebase -i' several times, moving the commit back in the sequence little-by-little.

-- Ram