-
Notifications
You must be signed in to change notification settings - Fork 1
/
CHANGELOG
52 lines (45 loc) · 2.31 KB
/
CHANGELOG
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
# v0.3.0 (2017-01-15)
- 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
# v0.2.1 (2017-01-06)
- 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
# v0.2.0 (2017-01-05)
- Add a 'filter' argument to select only subproject files for merging, that
match a given file name/path pattern (the 'filter').
# v0.1.4 (2016-12-29)
- Fix git warning 'fatal: Not a valid object name 0' when initializing a
subproject. Note: the warning did not affect initialization of the subproject!
# 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