Re: [PATCH] GIT commit statistics.

From: Junio C Hamano <junkio@cox.net>
Date: Nov 15, 2005, 03:00 UTC
Message-ID: <7vy83qty2v.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <46a038f90511140051o1fa5ef7cyb9dd723fb8161ef9@mail.gmail.com>

Martin Langhoff <martin.langhoff@gmail.com> writes:

Show 5 quoted lines

>> I've never felt need to "merge" the binary files myself and had
>> never got around doing this, but if you are interested, it would
>> go something like this:
>
> That's quite a bit of C hacking...

I'll be pushing out something along the lines I said in the proposed updates branch tonight. I've even run 1 (one) test ;-). The relevant commits are these:

+  [pu~5^2] rebase: make it usable for binary files as well.
+  [pu~5^2^] diff: --full-index
+  [pu~5^2~2] apply: allow-binary-replacement.
+  [pu~5^2~3] Rewrite rebase to use git-format-patch piped to git-am.

Note that this does not make generated "binary patch" usable across repositories yet. Since our patches are reversible out of principle, making it usable across repositories involves recording both the pre- and post-image of binary blobs in the patch output, which may be a useful option in some cases but not necessary for the immediate application of intra-repo rebasing.