On Tue, Jan 26, 2016 at 10:54 AM, david.w.smi...@gmail.com <david.w.smi...@gmail.com> wrote: > My only critique of it is that I sense the git branch.autosetuprebase option > (what Yonik is using) might be obsoleted by the pull.rebase option;
Maybe I don't understand what you're saying, but "git config branch.autosetuprebase always" just changes the default for new branches. I think we should recommend this for new git users, since someone will forget to type the rebase part of "git pull --rebase" and accidentally get merge commits when they didn't mean to (and it's already happened ;-) -Yonik --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@lucene.apache.org For additional commands, e-mail: dev-h...@lucene.apache.org