From: Junio C Hamano Date: Sat, 30 Aug 2008 20:52:23 GMT Subject: Re: [PATCH] git gui: use apply --unidiff-zero when staging hunks without context Message-ID: <7vprnqfcoo.fsf@gitster.siamese.dyndns.org> In-Reply-To: <20080830202706.GA13573@localhost> Clemens Buchacher writes: > On Sat, Aug 30, 2008 at 09:43:19PM +0200, Johannes Sixt wrote: >> Clemens Buchacher schrieb: >>> git apply does not work correctly with zero-context patches. It does a >>> little better with --unidiff-zero. >> >> No, NO, NOOOOO! This kills your data! > > Okay. Since we have 'Stage Line for Commit', supporting this would be almost > pointless anyways. So let's forget about trying to fix this and simply > disable zero-context diff in git-gui, as per my original patch > > [PATCH] git gui: show diffs with a minimum of 1 context line Well, showing is Ok as long as you do not try pick and apply. Or did I miss something?