I don't know anything about gerrit, but it looks like you did a git pull when you should have done a 'git pull --rebase'. git pull defaults to merging from the origin branch, that is your middle commit 0869, and that is almost always wrong.
rebase your branch onto master: git rebase origin/master (assuming your remote is called origin, the default) At that point you should have two commits, not three. It looks like you have two commits, one adds a parameter, one adds a test. Do you want that? Generally, you would submit a feature and test for the feature in the same commit... do this with 'git rebase -i origin/master' (you might need to google to get a tutorial) Cheers, Sam -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. For more options, visit https://groups.google.com/d/optout.
