From: Jonathan Nieder Date: Mon, 22 Mar 2010 22:09:29 GMT Subject: Re: [PATCH] Test that the 'rebase -i' "reword" command always cherry-picks a commit. Message-ID: <20100322220929.GA1384@progeny.tock> In-Reply-To: <1269285942-17496-1-git-send-email-marcnarc@xiplink.com> Marc Branchaud wrote: > Is this more acceptable than adding --no-ff to rebase--interactive? No, in my opinion the latter is better, and I suspect it will go in. :) No one has objected to the --no-ff option. I like it: if someone is trying to reset the committer date on a collection of patches, I’d rather they use rebase -f or rebase -i --no-ff than format-patch and am. It’s cooking in pu for the moment, and from here the natural progression is to next, master, then maybe maint. Hope that helps, Jonathan