In order to make things smoother and easier in the future, you may want to learn "topic branch" workflows (found in many git tutorial material). But it is too late for the history you already created; "cherry-pick" is your friend to recover from the shape of your existing history. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html