Thread (51 messages) flat view 51 messages, 5 authors, 2016-06-15

Re: [StGIT PATCH 5/5] Add --binary flag to commands that generate diffs

From: Catalin Marinas <hidden>
Date: 2016-06-15 22:43:12

On 19/05/07, Karl Hasselström [off-list ref] 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'.

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.

-- 
Catalin
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help