Skip to contentSkip to conversation

Git stuff

DISCUSSION Ralf Baechle 1 participant 1 message Dec 11, 2006 MIPS

lore
Share & tools
lore
#0 lore raw

I've been asked what that strange commit

commit e81fbbbb9a0d8072460c223e935fb1aca4231dc0
Merge: 6f0b1e5... 9202f32...
Author: Ralf Baechle <[email protected]>
Date: Mon Dec 11 12:25:29 2006 +0000

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torva

nothing to commit

from around noon today means - it's a merge commit where after resolution of the merge conflict there was nothing left to commit. Nothing to worry :)

Also sorry for the flood of commit messages. I cherry pick any commit that is a fix to the -stable branches which ends multiplying the number of commits. If you only care about certain branches you can use i.e. procmail to filter away the uninterestin messages. The format of the mail messages was choosen to make that easy.

Ralf