Re: Avoiding uninteresting merges in Cairo

Carl Worth [off-list ref] writes:

On Thu, 14 Dec 2006 21:06:29 -0500, Shawn Pearce wrote:

quoted

...
Cairo has seriously been using `reset --hard HEAD^` as part of its
workflow since April?

...
Also, I don't actually need this. I don't use the "reset --hard"
workflow suggested in the mail above. I always obtain remote changes
with "git fetch" and then examine things locally and decide to either
merge (or fast forward) with "git pull", (though maybe I'll start
using "git merge" now), or else to use "git rebase" to avoid the noisy
merge commits.

I wish I have more time to keep track of "recommended workflows"
that projects using git give to its developers.

I think what you recommend makes quite a lot of sense, for
very centralized setting, and would leave much more usable
history than the simple-minded way cvs-migration suggests.