Thread (3 messages) flat view 3 messages, 3 authors, 2016-06-15

Re: Merge commit before branch tip

From: Jonathan Nieder <hidden>
Date: 2016-06-15 22:49:11

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
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help