From: Stephen Haberman <stephen@exigencecorp.com>
Date: Thu, 08 Aug 2013 19:08:39 GMT
Subject: Re: [PATCH] pull: Allow pull to preserve merges when rebasing.
Message-ID: <20130808140839.56c8343f@sh9>
In-Reply-To: <1375983492-32282-2-git-send-email-stephen@exigencecorp.com>


> This is because "git pull" currently does not know about rebase's
> preserve merges flag, which would this behavior, and instead replay
> on the merge commit of the feature branch onto the new master, and
> not the entire feature branch itself.

Ack, sorry, I was doing this too late last night--should say:

This is because "git pull" currently does not know about rebase's
preserve merges flag, which would avoid this behavior by replaying the
merge commit of the feature branch onto the new master, and not
replaying each individual commit in the feature branch.

- Stephen