Skip to content

Release 1.0
Compare
Choose a tag to compare
@mhagger mhagger released this 19 Sep 09:00
· 188 commits to master since this release
v1.0.0
666f38a

Given the relative lack of automated testing, it's perhaps foolhardy to name this release 1.0.0. But I don't foresee having time to remedy the testing situation anytime soon, and I use git-imerge every day, so let's go.

Improvements since 0.7.0:

  • Add two new commands, git imerge drop and git imerge revert, for using incremental merging to get rid of unwanted commits from the branch history.
  • When committing merges, default to --no-edit. The default can be changed via a new configuration option, imerge.editMergeMessages.
  • If there is more than one merge base between the two branches, use the "best" one rather than refusing to start an imerge.
  • git imerge continue: commit a merge even if its diff is empty.
  • Improve docs.

Other changes and bug fixes:

  • Avoid some redundant test merges.
  • Fix some character encoding problems.
  • Run git checkout with its --quiet option.
  • Some fixes for bash completion.
  • Install the bash completion script as part of make install and make uninstall.
  • Handle DESTDIR in make install and make uninstall.
  • Fix a Windows incompatibility when calling git log from get_author_info().
Assets 2
Loading