From: Jonathan Nieder <jrnieder@gmail.com>
To: Bradley Wagner <bradley.wagner@hannonhill.com>
Cc: git@vger.kernel.org
Subject: Re: Merge commit before branch tip
Date: Mon, 26 Jul 2010 11:06:20 -0500 [thread overview]
Message-ID: <20100726160620.GA4399@burratino> (raw)
In-Reply-To: <AANLkTikp5dHz97qp3pf+DE-wABNVYTGAQ+h30D9Fa04c@mail.gmail.com>
Hi Bradley,
Bradley Wagner wrote:
> I realize this is not a best practice but is it possible to merge a
> branch but at a point before the branch tip?
I do not even think it is not a best practice. You can do
$ git fetch --all
$ git merge origin/master~1
and git will happily create a merge with message
Merge remote branch 'origin/master' (early part)
(See the "SPECIFYING REVISIONS" section of git-rev-parse(1)
for more examples.)
Hope that helps,
Jonathan
next prev parent reply other threads:[~2010-07-26 16:07 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-26 15:38 Merge commit before branch tip Bradley Wagner
2010-07-26 16:06 ` Jonathan Nieder [this message]
2010-07-26 16:15 ` Matthieu Moy
2010-07-26 16:08 ` Eugene Sajine
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=20100726160620.GA4399@burratino \
--to=jrnieder@gmail.com \
--cc=bradley.wagner@hannonhill.com \
--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;
as well as URLs for NNTP newsgroup(s).