Skip to content

Release 1.2.0

Latest
Latest
Compare
Choose a tag to compare
@mhagger mhagger released this 20 Sep 14:09
· 41 commits to master since this release
v1.2.0
This tag was signed with the committer’s verified signature.
mhagger Michael Haggerty
GPG key ID: C20F66AD1C1F9809
Learn about vigilant mode.
c3fbcae

What's new in git-imerge 1.2.0 (since release 1.1.0):

  • Add a --commit option to git imerge reparent, which lets a
    sequence of merges be reparented.

  • Add three more goal options: border, border-with-history, and
    border-with-history2.

  • Retain author information in more situations (i.e., whenever
    retaining the commit message).

  • Set up to release to PyPI.

  • Switch tests to use tox.

  • Make Python 3 more prominent than Python 2 in the docs.

  • Add axes and labels to the text version of the git-imerge diagram output.

  • Improve the test suite.

  • Convert the README and TODO files to markdown.

Note that this release has actually (finally) been uploaded to PyPI 🎊 Thanks to @jdufresne for doing most of the work to set that up and my deepest apologies for not getting around to it until now.

Assets 2