peter at stuge.se
Fri Mar 8 13:29:42 CET 2013
Peter Stuge wrote:
> > We generally avoid merge commits in coreboot
> Merge commits are append-only and exactly preserve development
> history. Alert readers noticed that a rebase means that commits
> must change. This is frowned upon if someone has already seen the
> commits as they were before the rebase, but it is perfectly fine if
> they only exist locally.
Using Gerrit allows us to comfortably rework commits until we are
happy with them, without needing to rewrite any branch in
coreboot.git. Gerrit acts as a buffer, where anything goes, until
the commits are "submitted" into coreboot.git.
More information about the coreboot