Skip to content

Commit

Permalink
Prepare release v0.1.2
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
episource committed Dec 18, 2016
1 parent 1535402 commit 4fa7615
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# v0.1.2 (SNAPSHOT)
# 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
Expand Down

0 comments on commit 4fa7615

Please sign in to comment.