git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jeff King <peff@peff.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: Mukund Sivaraman <muks@banu.com>, git@vger.kernel.org
Subject: Re: Including branch info in git format-patch
Date: Thu, 19 Jun 2008 17:08:05 -0400	[thread overview]
Message-ID: <20080619210804.GA6700@sigill.intra.peff.net> (raw)
In-Reply-To: <20080619210617.GC6529@sigill.intra.peff.net>

On Thu, Jun 19, 2008 at 05:06:17PM -0400, Jeff King wrote:

> > the project's convention what to do with it.  The side branch the patch
> > was developed on may be named "quick-hack", which would not have any
> > relevance to the final location of where that patch wants to be in.
> 
> I suspect you would do better to look at branch.quick-hack.merge, so
> that you say "this was based on upstream's X", not "this is my
> quick-hack".
> 
> But there are so many ways this could go wrong, since the patches you're
> formatting might not even have anything to do with the branch you're on.

Side note: if you have a particular workflow, it might make sense,
rather than using format-patch directly, to codify that workflow in
another script which says "ok, this is how I grab a branch and send it
upstream". And in that case, you could look up "here's where I branched
from" and feed it into the patch via format-patch's --subject-prefix
option.

-Peff

  reply	other threads:[~2008-06-19 21:09 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-06-19 15:42 Including branch info in git format-patch Mukund Sivaraman
2008-06-19 20:28 ` Jeff King
2008-06-19 20:54   ` Junio C Hamano
2008-06-19 21:06     ` Jeff King
2008-06-19 21:08       ` Jeff King [this message]
2008-06-19 21:15     ` Sverre Rabbelier
2008-06-19 21:26     ` Mukund Sivaraman
2008-06-19 21:41       ` Junio C Hamano
2008-06-19 21:55         ` Mukund Sivaraman

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=20080619210804.GA6700@sigill.intra.peff.net \
    --to=peff@peff.net \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=muks@banu.com \
    /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).