All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jonathan Nieder <jrnieder@gmail.com>
To: git@vger.kernel.org
Cc: Paul Gortmaker <paul.gortmaker@windriver.com>,
	Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	stable@vger.kernel.org, Jeff King <peff@peff.net>,
	Bart Trojanowski <bart@jukie.ca>
Subject: How to request a fast-forward pull
Date: Mon, 20 Aug 2012 13:40:33 -0700	[thread overview]
Message-ID: <20120820204033.GA636@mannheim-rule.local> (raw)
In-Reply-To: <20120820202803.GA8378@windriver.com>

Hi gitsters,

Paul Gortmaker wrote:

> When you have a moment, would you please migrate this
> across to your main linux-stable repository?
>
> Both a branch and signed tag are present and pointing at
> the same commit, but "git request-pull" does favour output
> of the tag over the branch name.
>
> But merging the tag will want to create a merge commit.
>
> So, to avoid a merge commit in your repo, you can fetch
> (fast fwd) into your (local) branch from my branch at:
>
>  git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux-stable.git linux-2.6.34.y
>
> and then fetch the signed tag listed below after that.

Can this be made easier?  I could imagine request-pull learning
--ff-only that generates a message like

	Greg,

	Please pull --ff-only

	 git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux-stable.git linux-2.6.34.y

	to get the following changes [...]

which could work ok if the recipient notices the --ff-only, but I
wonder if there is a simpler way.

Thanks for the food for thought,
Jonathan

       reply	other threads:[~2012-08-20 20:40 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <20120820202803.GA8378@windriver.com>
2012-08-20 20:40 ` Jonathan Nieder [this message]
2012-08-21  6:41   ` How to request a fast-forward pull Jeff King
2012-08-21 17:22     ` Junio C Hamano
2012-08-23  0:31       ` Ben Hutchings

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=20120820204033.GA636@mannheim-rule.local \
    --to=jrnieder@gmail.com \
    --cc=bart@jukie.ca \
    --cc=git@vger.kernel.org \
    --cc=gregkh@linuxfoundation.org \
    --cc=paul.gortmaker@windriver.com \
    --cc=peff@peff.net \
    --cc=stable@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.