Thread (16 messages) flat view 16 messages, 7 authors, 2016-06-15

Re: How should I handle binary file with GIT

From: Junio C Hamano <hidden>
Date: 2016-06-15 22:42:23

moreau francis [off-list ref] writes:
For now they only send me the text updates through patch and attach new images
with the patch email. Then I do:

        $ git am < text_only_patch
        $ git reset --soft HEAD^
        $ git add <new images>
        $ git commit -a -C ORIG_HEAD

Now my question: is it the best way to achieve this process ?
If I were doing that today, I would be doing almost exactly the
above sequence, or:

	$ git am patch
        $ git add <new images>
        $ git commit -a --amend

It _might_ make sense to adopt a well-defined binary patch
format (or if there is no prior art, introduce our own) and
support that format with both git-diff-* brothers and git-apply,
but that would be a bit longer term project.


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