Skip to main content

Squashing Commits

When submitting a pull request to RDF4J, we sometimes ask that you squash your commits, either so you can clean up the commit history a bit, or for example when some of your commits weren’t correctly signed off. Here we explain a simple way to do that.

On the command line, the process is as follows:

  1. Make sure your local master and develop branches are up to date with the upstream.
  2. Check out your pull request branch.
  3. Run git rebase -i master --signoff (or git rebase -i develop --signoff if your branch started from the develop branch).
    The --signoff flag here makes sure that the new commit produced by the squash operation is correctly signed off. You should see a list of commits, each commit starting with the word pick. Make sure the first commit says “pick” and change the rest from “pick” to “squash”.
  4. Save and close the editor. It will give you the opportunity to change the commit message.
  5. Save and close the editor again. Then you have to force push the final, squashed commit: git push --force-with-lease origin.

About

Eclipse rdf4j is a powerful Java framework for processing and handling RDF data. This includes creating, parsing, scalable storage, reasoning and querying with RDF and Linked Data. It offers an easy-to-use API that can be connected to all leading RDF database solutions. It allows you to connect with SPARQL endpoints and create applications that leverage the power of linked data and Semantic Web.


RDF4J Architecture

Back to the top