Why is this a problem? It records the fact that you had pull'd and had to merge your changes with what "came in" from master from other devs.
Such historical accuracy, while looking "dirty" to some devs, is nevertheless accurate to what actually transpired, and can therefore be useful to future devs digging through the history. Mike McCandless http://blog.mikemccandless.com On Tue, Jan 26, 2016 at 11:18 AM, david.w.smi...@gmail.com <david.w.smi...@gmail.com> wrote: > Yup. And when you pulled, you didn't do it via rebase. I'll assume you're > in the camp of not wanting these merge commits and non-liinear history (and > thus loops) -- granted I don't think you explicitly stated your opinion. > So, even if you followed Yoniks' advice (and not mine) and thus set the > branch.autosetuprebase option, that AFAIK only affects repos created *after* > you set that option. I recommend you remove that setting if you have and > instead set this: > git config --global pull.rebase true > (or at your discretion remove the --global and thus only set this on this > project). > > Cheers, > ~ David > -- > Lucene/Solr Search Committer, Consultant, Developer, Author, Speaker > LinkedIn: http://linkedin.com/in/davidwsmiley | Book: > http://www.solrenterprisesearchserver.com > > > --------------------------------------------------------------------- > To unsubscribe, e-mail: dev-unsubscr...@lucene.apache.org > For additional commands, e-mail: dev-h...@lucene.apache.org --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@lucene.apache.org For additional commands, e-mail: dev-h...@lucene.apache.org
