On Jul 2, 2012, at 2:30 AM, Subramanya Sastry wrote:
One thing I just noticed when looking at the git history via gitk (on Ubuntu) is that the
history looks totally spaghetti and it is hard to make sense of the history. This seems
to have happened since the switch to git and post-commit review workflow. It might be
worth considering this as well. git pull --rebase (which I assume is being used) usually
helps eliminate noisy merge commits, but I suspect something else is going on --
post-review commit might be one reason. Is this something that is worth fixing and can be
fixed? Is there some gerrit config that lets gerrit rebase before merge to let
fast-forwarding and eliminate noisy merges?
Subbu.
Yep, this happens whenever a change is merged from the gerrit interface.
What we use locally to pull from gerrit doesn't influence the repository.
Also, one doesn't need `git pull --rebase` if you work in a topic branch instead of
master (which everybody should). Other wise pulling from master mighit indeed cause a
merge commit. But even then, git-review will warn when trying to push for review because
it'll have to push 2 commits instead of one.
So best to always work in a topic branch, keep master clean, and do simple pulls from
gerrit/master.
-- Krinkle