Confused about github rebasing

[H. S. Teoh]

On Fri, Mar 16, 2012 at 04:52:35PM +1300, James Miller wrote:
[...]
> Generally I find that pulls should be rebased, ff-only, and local
> merges done with --no-ff. This means that you have merge history in
> the tree, which can be useful when trying to do code archaeology, and
> pulls are forced to be merged properly, rather than using a merge
> commit, avoiding annoying messages in the log.

Why should merges be --no-ff? Doesn't that create a whole bunch of
"spurious" commits in the history?


> Git is a strange beast, one moment it is peacful and helpful, the next
> it is scary and threatening to eat your files.
[...]

The way you worded it made me misread the last phrase as "threatening to
eat your face". :-P


T

-- 
Skill without imagination is craftsmanship and gives us many useful
objects such as wickerwork picnic baskets.  Imagination without skill
gives us modern art. -- Tom Stoppard