[OpenAFS-devel] Gerrit/git mistake

[Steven Jenkins]

On Tue, Oct 19, 2010 at 8:35 AM, Phillip Moore
<w.phillip.moore@gmail.com> wrote:
...I just did "git
> pull" to update my copy of master.
> Was that the wrong way to stay in sync? =A0Am I supposed to be using reba=
se
> instead?
> Looking at gerrit, two of those "changes" are empty, and the most recent =
one
> has the fs getfid patch I thought I was submitting.
> Can someone let me know what I did wrong, so I can avoid the same mistake=
 in
> the future?

You typically want to do

git pull --rebase

instead of a plain

git pull

to stay in sync so that the tree is not littered with those trivial
'merge' commits.

Steven