On 03/01/2010 09:20 AM, Johannes Sixt wrote:
Christian Couder schrieb:
The goal of this patch series is to make it possible for "git cherry-pick"
to fast forward instead of creating a new commit if the cherry picked commit
has the same parent as the one we are cherry-picking on.
Why don't you just divert to 'git merge --ff' in this case?
Because the purpose of the series is exactly to replace
if A^ == HEAD; then
git merge --ff A # or git reset --hard A
else
git cherry-pick A
fi
with a single "git cherry-pick --ff A".
An alternative would be the old ff-strategy series which would allow
something like
git merge --ff=only A || git cherry-pick A
Paolo
--
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