From: Junio C Hamano <junkio@cox.net>
Date: Wed, 05 Apr 2006 08:14:16 GMT
Subject: Re: How should I handle binary file with GIT
Message-ID: <7v3bgs4exz.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <20060405073022.13054.qmail@web25806.mail.ukl.yahoo.com>

moreau francis <francis_moreau2000@yahoo.fr> 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.