git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: Merge commit before branch tip

From
Matthieu Moy <matthieu.moy@grenoble-inp.fr>
Date
Jul 26, 2010, 16:15 UTC
Message-ID
<vpqy6cyw77d.fsf@bauges.imag.fr>
In-Reply-To
<20100726160620.GA4399@burratino>
Jonathan Nieder <jrnieder@gmail.com> writes:
Show 11 quoted lines
> 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
... or whatever commit identifier indeed:
   $ git merge 64fdc08da

is fine too, but you have to find out the 64fdc08da part (using git log for example).

-- 
Matthieu Moy
http://www-verimag.imag.fr/~moy/
Previous: Jonathan NiederNext: Eugene Sajine
Message 3 of 4 in “Merge commit before branch tip”
  1. Bradley WagnerJul 26, 2010
  2. Jonathan NiederJul 26, 2010
  3. Matthieu MoyJul 26, 2010
  4. Eugene SajineJul 26, 2010

Read the whole thread, see it on lore, or plain text.

$ 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.