From: Clemens Buchacher Date: Sat, 30 Aug 2008 20:27:06 GMT Subject: Re: [PATCH] git gui: use apply --unidiff-zero when staging hunks without context Message-ID: <20080830202706.GA13573@localhost> In-Reply-To: <48B9A2D7.8090801@telecom.at> 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 Clemens