From: Matthieu Moy <matthieu.moy@grenoble-inp.fr>
Date: Mon, 26 Jul 2010 16:15:02 GMT
Subject: Re: Merge commit before branch tip
Message-ID: <vpqy6cyw77d.fsf@bauges.imag.fr>
In-Reply-To: <20100726160620.GA4399@burratino>

Jonathan Nieder <jrnieder@gmail.com> writes:

> 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/