Git development
 help / color / mirror / Atom feed
From: Junio C Hamano <junkio@cox.net>
To: moreau francis <francis_moreau2000@yahoo.fr>
Cc: git@vger.kernel.org
Subject: Re: How should I handle binary file with GIT
Date: Wed, 05 Apr 2006 01:14:16 -0700	[thread overview]
Message-ID: <7v3bgs4exz.fsf@assigned-by-dhcp.cox.net> (raw)
In-Reply-To: <20060405073022.13054.qmail@web25806.mail.ukl.yahoo.com> (moreau francis's message of "Wed, 5 Apr 2006 09:30:22 +0200 (CEST)")

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.


        

  reply	other threads:[~2006-04-05  8:14 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-04-05  7:30 How should I handle binary file with GIT moreau francis
2006-04-05  8:14 ` Junio C Hamano [this message]
2006-04-05 12:21   ` moreau francis
2006-04-05 13:25     ` Nicolas Pitre
2006-04-05 13:35       ` moreau francis
2006-04-05 13:06   ` Nicolas Pitre
2006-04-05 13:18   ` moreau francis
2006-04-05 19:23     ` Marco Roeland
2006-04-05 15:11   ` Jakub Narebski
2006-04-05 15:32     ` Nicolas Pitre
2006-04-05 15:37       ` Randal L. Schwartz
2006-04-05 15:55         ` Shawn Pearce
2006-04-05 16:25           ` Nicolas Pitre
2006-04-05 16:21         ` Nicolas Pitre
2006-04-05 18:34         ` Junio C Hamano
2006-04-05 18:51           ` Randal L. Schwartz
2006-04-05 19:31           ` Nicolas Pitre
2006-04-05 20:20             ` Junio C Hamano

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=7v3bgs4exz.fsf@assigned-by-dhcp.cox.net \
    --to=junkio@cox.net \
    --cc=francis_moreau2000@yahoo.fr \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox