Discovered git grafts and git-replace today. Git is one of those tools you never fully master (it seems).