On Thu, Dec 18, 2008 at 12:39:06PM +0200, Hasso Tepper wrote: > 4) Now I have to switch to master and merge? This is how my journey > stopped: > > $ git checkout master > $ git merge --no-commit OPENPAM Since you know exactly which commit you want to merge, what about this? $ git merge --no-commit OPENPAM^ OPENPAM Cheers.