You can always use git pull --rebase, (make it the default) to not pollute the history with useless merge commits. This will fetch the changes from the server and rebase your commits on top of them (like svn does).
On Tue, Jan 26, 2016 at 4:58 PM, Joel Bernstein <[email protected]> wrote: > > https://github.com/apache/lucene-solr/commit/bc815b5207638c676810699bae592fc8f3d93abd > > Is this something that I need to fix? > > These were my commands: > > defaultildsMBP5:lucene-solr joelbernstein$ git pull origin master > > remote: Counting objects: 507, done. > > remote: Compressing objects: 100% (66/66), done. > > remote: Total 95 (delta 41), reused 0 (delta 0) > > Unpacking objects: 100% (95/95), done. > > From https://git-wip-us.apache.org/repos/asf/lucene-solr > > * branch master -> FETCH_HEAD > > 0ff8d11..85ae198 master -> origin/master > > Merge made by the 'recursive' strategy. > > lucene/CHANGES.txt > | 5 +++++ > > lucene/core/src/java/org/apache/lucene/index/PrefixCodedTerms.java > | 21 ++++++++++++------- > > lucene/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java > | 107 > +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------- > > lucene/memory/src/test/org/apache/lucene/index/memory/TestMemoryIndex.java > | 27 ++++++++++++++++++++++++ > > lucene/queries/src/java/org/apache/lucene/queries/TermsQuery.java > | 52 +++++++++++++++++++++++++++++----------------- > > lucene/queries/src/test/org/apache/lucene/queries/CommonTermsQueryTest.java > | 2 +- > > lucene/sandbox/src/test/org/apache/lucene/search/TestGeoPointQuery.java > | 35 +++++++++++++++++++++++++++++++ > > > lucene/sandbox/src/test/org/apache/lucene/search/TestLatLonPointQueries.java > | 25 ++++++++++++++++++---- > > lucene/sandbox/src/test/org/apache/lucene/util/BaseGeoPointTestCase.java > | 1 - > > solr/core/src/java/org/apache/solr/cloud/SyncStrategy.java > | 2 +- > > solr/core/src/java/org/apache/solr/search/facet/FacetRequest.java > | 10 ++++++--- > > solr/core/src/test/org/apache/solr/search/facet/TestJsonFacets.java > | 22 +++++++++++++++++++- > > 12 files changed, 240 insertions(+), 69 deletions(-) > > defaultildsMBP5:lucene-solr joelbernstein$ git status > > On branch master > > Your branch is ahead of 'origin/master' by 2 commits. > > (use "git push" to publish your local commits) > > > nothing to commit, working directory clean > > defaultildsMBP5:lucene-solr joelbernstein$ git push origin master > > Counting objects: 81, done. > > Delta compression using up to 8 threads. > > Compressing objects: 100% (21/21), done. > > Writing objects: 100% (28/28), 3.34 KiB | 0 bytes/s, done. > > Total 28 (delta 12), reused 0 (delta 0) > > To https://git-wip-us.apache.org/repos/asf/lucene-solr.git > > 85ae198..bc815b5 master -> master --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
