11 Sep
2011
11 Sep
'11
3:05 p.m.
Hmm, on second thought, I suspect your problem is that you merge instead of rebase on "git pull". Check that you've got the rebase flag set to true, i.e. your .git/config should contain something like this:
[branch "7.9"] remote = origin merge = refs/heads/7.9 rebase = true