-
Notifications
You must be signed in to change notification settings - Fork 1
/
CHANGELOG
22 lines (19 loc) · 1.02 KB
/
CHANGELOG
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
# v0.1.3 (2016-12-26)
- 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).
# v0.1.2 (2016-12-18)
- 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.
# v0.1.1 (2016-12-07)
- Multiple subprojects sharing the same combination of source/target-branch are
now distinguished properly. Previously subprojects were mixed when push
operations were involved.
# v0.1.0 (2016-11-29)
- Initial version