Re: Merge commit before branch tip

From: Jonathan Nieder <jrnieder@gmail.com>
Date: Jul 26, 2010, 16:06 UTC
Message-ID: <20100726160620.GA4399@burratino>
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

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.