On Jul 10, 2013 12:07 PM, "Richard Marais" <richardmar...@gmail.com> wrote: ... > > Here is the list of commits, not the position of 72ba712:
I've noted it. It's not a descendant of origin/master. Pushing it as origin/master would effectively discard 3a55dca. I believe what you want to do is cherry-pick 72ba712 onto a new branch based on the latest origin/master, then push that back to origin/master. > Richard@RICHARD-PC /e/Work/MH (master) > $ git lol > * eec2ab2 (HEAD, master) Merge branch 'master' of file:///V:\ > |\ > | * 3a55dca (origin/master) <comments> > * | 72ba712 <comments> > * | bc55eb5 <comments> > * | c2aa448 Merge branch 'master' of file:///V:\ > |\ \ > | |/ > | * 930430f <comments> > * | fc7a55b <comments> > * | fd401a5 <comments> -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
