Re: Val.true and Val.false [Was: XMLRPC] (from pike@roxen.com)

----- Original Message ----

From: "Martin Stjernholm, Roxen IS @ Pike developers forum" 10353@lyskom.lysator.liu.se To: pike-devel@lists.lysator.liu.se Sent: Sun, September 11, 2011 3:05:03 PM Subject: Re: Val.true and Val.false [Was: XMLRPC] (from pike@roxen.com)

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

Yes, that was it. Is that documented anywhere, or is that something I should have known? This is the only thing I use git with, for my personal projects I use mercurial.