v0.3.1 - Bugfix release

This is a bugfix release. No new features have been added.

See README for a description of the project.

Changes since v0.3.0:

• Support prefix directories containing regexp metacharacters properly
  (previously the wrong prefix directory might have been chosen)

See CHANGELOG for other changes.

v0.3.0 - Foreign branches

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.

v0.2.1 - Performance & Bugfixes

Improve performance and auto generated commit messages when using filters.

See README for a description of the project.

Changes since v0.2.0:

• Include only history of subproject files selected by a given filter in
  the auto-generated commit message
• Improve performance of subproject merges for for source branches with
  lots of files, but restrictive filters
• Include filter expression in auto-generated commit messages

See CHANGELOG for other changes.

v0.2.0 - Add 'filter' argument

This release adds a 'filter' argument to include only matching files
in a subproject.

See README for a description of the project.

Changes since v0.1.4

• Add a 'filter' argument to select only subproject files for merging,
  that match a given file name/path pattern (the 'filter').

See CHANGELOG for other changes.

v0.1.4 - Bugfix release

This is a bugfix release. No new features have been added.

See README for a description of the project.

Changes since v0.1.3

• Fix git warning 'fatal: Not a valid object name 0' when initializing a
  subproject. Note: the warning did not affect initialization of the
  subproject!

See CHANGELOG for other changes.

v0.1.3 - Only refactorings

This release consists of refactorings, only. No new features have been added and no bugs have been fixed.

See README for a description of the project.

Changes since v0.1.2

• Git-subproject no longer invokes git merge --squash -s subtree2, but
  uses the same shared merge implementation as the subtree2 merge
  strategy (this is an internal code change, that might improve
  performance, but does not affect externally visible behavior).

See CHANGELOG for other changes.

v0.1.2 - Bugfix release

This is a bugfix release. No new features have been added.

See README for a description of the project.

Changes since v0.1.1

• Accept qualified (remote) branch names (that is
  'remotes/origin/branch' instead of 'origin/branch').
• v0.1.1 introduced a bug, that resulted in push-merges not being
  considered when calculating the merge base (more precise: they have
  been considered only if "my-prefix" was equal to "their-prefix"). This
  issue is now resolved.
• When parsing their branch's history, the order of the marker arguments
  is not relevant any more. This might improve forward compatibility.

See CHANGELOG for other changes.

v0.1.1 - Bugfix release

This is a bugfix release. No new features have been added.

See README for a description of the project.

Changes since v0.1.0

• Multiple subprojects sharing the same combination of source/target-branch are
  now distinguished properly. Previously subprojects were mixed when push
  operations were involved.

See CHANGELOG for other changes.

v0.1.0 - Initial release

This is the initial release of this project. It hasn't been tested in-depth.

See README for a description of the project.