User: Password:
Subscribe / Log in / New account

Git hints: ORIG_HEAD and merging

For those looking for some advanced git tricks: this Google+ conversation has a lot to offer, especially with regard to difficult merges. Much of it comes from Linus himself: "You didn't know about ORIG_HEAD? That's literally a 'Day One' feature of git, exactly because it's so incredibly useful (especially to a maintainer). We had ORIG_HEAD back when you had to script your stuff manually and bang two rocks together to make git do anything at all."
(Log in to post comments)

Copyright © 2012, Eklektix, Inc.
Comments and public postings are copyrighted by their creators.
Linux is a registered trademark of Linus Torvalds