From: Junio C Hamano Date: Sun, 29 Nov 2009 05:15:05 GMT Subject: Re: "git merge" merges too much! Message-ID: <7vskbxewti.fsf@alter.siamese.dyndns.org> In-Reply-To: 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.