lucene-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Yonik Seeley <ysee...@gmail.com>
Subject Re: Merge vs Rebase
Date Tue, 26 Jan 2016 16:22:07 GMT
On Tue, Jan 26, 2016 at 10:54 AM, david.w.smiley@gmail.com
<david.w.smiley@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-unsubscribe@lucene.apache.org
For additional commands, e-mail: dev-help@lucene.apache.org


Mime
View raw message