git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Junio C Hamano <junkio@cox.net>
To: Marco Costalba <mcostalba@yahoo.it>
Cc: git@vger.kernel.org
Subject: Re: [RFC] Patches exchange is bad?
Date: Tue, 16 Aug 2005 14:02:51 -0700	[thread overview]
Message-ID: <7vzmrh8uis.fsf@assigned-by-dhcp.cox.net> (raw)
In-Reply-To: <20050816200132.88287.qmail@web26304.mail.ukl.yahoo.com> (Marco Costalba's message of "Tue, 16 Aug 2005 13:01:32 -0700 (PDT)")

Marco Costalba <mcostalba@yahoo.it> writes:

> It is just a very thin layer above the two git scripts, the only extra work 
> is the cleaning up of some info that git-format-patch-script automatically adds, 
> so that the new commits look like the originals (i.e. same header and description).

> What do you think?

All good.  The existing tools are designed to work well in the
following workflow:

    $ git format-patch --mbox master..pu
    $ cat 000[234]-*.txt >to-apply
    $ git checkout master
    $ git applymbox to-apply
    $ mv .git/refs/heads/pu .git/refs/heads/old-pu
    $ git checkout -b pu master
    $ git applymbox 0001-*.txt

to advance "master" with selected commits, possibly reordered,
from the "pu" branch, and rebase the "pu" branch using the
remaining commits.

I would like to know a bit about "git format-patch" adding extra
info that you needed to get rid of.  It shouldn't be necessary.

  parent reply	other threads:[~2005-08-16 21:02 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2005-08-16 20:01 [RFC] Patches exchange is bad? Marco Costalba
2005-08-16 20:39 ` Johannes Schindelin
2005-08-16 21:02 ` Junio C Hamano [this message]
2005-08-16 21:31 ` Martin Langhoff
2005-08-17 17:12 ` Catalin Marinas
  -- strict thread matches above, loose matches on Subject: below --
2005-08-16 21:47 Marco Costalba
2005-08-16 22:09 Marco Costalba
2005-08-16 22:45 ` Daniel Barkalow
2005-08-17  8:27 Marco Costalba
2005-08-17  9:07 ` Martin Langhoff
2005-08-17 17:35 Marco Costalba
2005-08-17 21:27 ` Catalin Marinas
2005-08-17 21:37   ` Johannes Schindelin
2005-08-18 10:27     ` Catalin Marinas
2005-08-17 18:03 Marco Costalba
2005-08-18 10:00 Marco Costalba
2005-08-18 11:16 ` Catalin Marinas
2005-08-18 13:34 Marco Costalba
2005-08-18 13:41 ` Catalin Marinas

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=7vzmrh8uis.fsf@assigned-by-dhcp.cox.net \
    --to=junkio@cox.net \
    --cc=git@vger.kernel.org \
    --cc=mcostalba@yahoo.it \
    /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;
as well as URLs for NNTP newsgroup(s).