From: Karl Hasselström Date: Tue, 22 May 2007 13:31:29 GMT Subject: Re: [StGIT PATCH 5/5] Add --binary flag to commands that generate diffs Message-ID: <20070522133129.GB12626@diana.vm.bytemark.co.uk> In-Reply-To: On 2007-05-22 13:15:13 +0100, Catalin Marinas wrote: > On 19/05/07, Karl Hasselström wrote: > > > This just passes the --binary option to git-diff-*, which causes > > the generated diffs to contain an applyable diff even when binary > > files differ. It's necessary to do this if you want to mail > > patches to binary files. > > I applied this patch but is there anything wrong if we have this > option on by default, at least for some commands? Maybe we don't > need it for 'show' and 'diff' but we definitely need it for 'mail' > and 'export'. I'd be fine with that. > There is also git.apply_diff() which calls git.diff(). This is first > tried when pushing a patch and followed by a three-way merged if it > fails. I think we should always have the --binary option in this > case. Yes, that sounds good. -- Karl Hasselström, kha@treskal.com www.treskal.com/kalle