Skip to content

v0.3.0 - Foreign branches
Compare
Choose a tag to compare
@episource episource released this 15 Jan 12:26
· 1 commit to master since this release
v0.3.0
62d9c75

Most notably, the ability to add subprojects based on "foreign" branches has been added. Also the merge options --ours, --theirs and --union have been fixed.

See README for a description of the project.

Changes since v0.2.1:

  • Add subprojects based on "foreign" branches, that is a source branch located in a different repository. Such "foreign" branches are fetched and pushed automatically.
  • Identify push commits based on subproject id instead of branch name and prefix
  • Add option --no-diff3 to disable diff3 mode when set as default
  • Add option --allow-empty to allow empty commits which are useful for changing subproject options
  • Fix error 'git: Argument list too long' when the autogenerated commit message gets longer
  • Fix options --diff3, --ours, --theirs and --union which have been broken since v0.1.3
  • Don't invoke git merge while formatting help
  • Code cleanup

See CHANGELOG for other changes.

Assets 4
Loading