On Mon, Apr 8, 2013 at 11:23 AM, Roy Stogner <roystgnr@ices.utexas.edu> wrote:
"git config branch.master.rebase true" and
"git config branch.autosetuprebase always" to tell pulls on the fork
to rebase by default?

Yep - these are a good idea... I do those... _and_ put --rebase on the "git pull" command just in case (like just in case I haven't set those options on the particular machine I am working on)