Download Latest Version
Release 1.2.0 source code.zip (76.2 kB)
Get an email when there's a new version of git-imerge
| Name | Modified | Size | Downloads / Week |
|---|---|---|---|
| Parent folder | |||
| README.md | 2016-09-19 | 1.2 kB | |
| Release 1.0 source code.tar.gz | 2016-09-19 | 58.8 kB | |
| Release 1.0 source code.zip | 2016-09-19 | 68.4 kB | |
| Totals: 3 Items | 128.3 kB | 0 | |
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().
