Re: [PATCH] Teach git-gui to split hunks

From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Dec 13, 2007, 14:18 UTC
Message-ID: <Pine.LNX.4.64.0712131417110.27959@racer.site>
In-Reply-To: <47613BA6.1060705@viscovery.net>

Hi,

On Thu, 13 Dec 2007, Johannes Sixt wrote:

Show 18 quoted lines

> Johannes Schindelin schrieb:
> > On Thu, 13 Dec 2007, Junio C Hamano wrote:
> > 
> >> Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
> >>
> >>> For this to work, apply has to be called with --unidiff-zero, since 
> >>> the new hunks can start or stop with a "-" or "+" line.
> >> You do not have to do "unidiff zero".  Suppose you have this hunk you 
> >> need to split.
> >>
> >> [describes to pick zero or more '-' lines and zero or more '+' lines]
> > 
> > I thought about that, but the UI is not trivial.  The UI for my 
> > solution is.
> 
> It's probably sufficient to have an option "Stage this Line": Once you 
> have staged enough lines, the hunk will be split automatically by the 
> current number-of-context-lines setting.

And your hand falls off... ;-)

Seriously, I often have a big chunk of changes, for example with an indentation change, where I want to stage everything _but_ one line in the middle. Just staging that, "git checkout <file>" and fixing the indentation of that single line speeds up my procedure vastly.

Ciao, Dscho