Re: How to split a big commit

From: Nguyen Thai Ngoc Duy <pclouds@gmail.com>
Date: Apr 4, 2011, 14:25 UTC
Message-ID: <BANLkTinpiR2sHS35uqD+uLnTKVtimhT7eg@mail.gmail.com>
In-Reply-To: <20110404130016.GA16975@kytes>

On Mon, Apr 4, 2011 at 8:00 PM, Ramkumar Ramachandra <artagnon@gmail.com> wrote:

> To split a big commit, I simply reverse-diff-apply the changes that I
> don't want in the big commit, and I stage all changes.  Then, I again
> reverse-diff-apply all the staged changes, and keep that in the
> unstaged portion.

Won't work for me. The reverse part would be way larger than the to-commit part.

> ...
> I can afford to do this kind of jugglery very easily because I use
> Magit with Emacs.  After highlighting the relevant portions,
> reverse-diff-apply is one keystroke :)

Hmm.. interesting. Never got around to actually use magit. I may have a good reason now.

> But yes, you're probably right-
> there should be an easier way to do this.  Maybe a 'git split' that
> allows you to interactively select the portions of an existing commit
> that you'd like to exclude from the commit and turn into a new commit?

Hmm..yeah something like grep for chunks, then automatically splitting those chunks out would be nice.

I have another use for such a tool too. When .po files are automatically updated by intltool (gnome translation helper tool), comment lines are all changed because they contain source line and those line likely change. With this tool I can filter out comment-only changes.

Thanks for the idea.

-- 
Duy