CHANGELOG.md

4.0.1 (2023-11-27)

Bug Fixes

• ignore empty stash (d8e9734), closes #55

4.0.0 (2023-11-27)

Features

• upgrade to semantic-release 22 and use esm (e618c08)

BREAKING CHANGES

• Removed support for semantic-release v20 and v21. Requires v22.0.7 or later.

3.2.1 (2023-09-21)

Bug Fixes

• Do not allow semantic-release v22 (758caaa)

3.2.0 (2023-05-11)

Features

• add option for fast forwarding during commit (c7d5bf4), closes #49

3.1.0 (2023-02-12)

Features

• retry remote Git operations (3138c56), closes #41

3.0.0 (2023-02-12)

Bug Fixes

• Compatibility with semantic-release v20 (d8b8332), closes #38

Features

• remove branchName setting (7a5772d)
• rename branches to backmergeBranches (f84713b)

BREAKING CHANGES

• Setting branches is renamed into backmergeBranches to avoid conflicts with the setting for semantic-release.
• branchName setting is removed. Use backmergeBranches instead.
• Import semantic-release functions via ESM. Loses compatibility with semantic-release before v20.

2.2.0 (2023-02-12)

Bug Fixes

• message default value (4ada405)

Features

• rename "branches" to "backmergeBranches" (3c16d6a)

2.1.3 (2023-01-11)

Bug Fixes

• limit to semantic-release below 20.0.0 (4dbca4a)
• update dev-dependencies (3771228)

2.1.2 (2022-03-01)

Bug Fixes

• abort process when encountering unrecoverable error (#33) (5e9b60c)

2.1.1 (2022-02-19)

Bug Fixes

• improve logging (#31) (e5a04d7)

2.1.0 (2021-11-01)

Features

• add branches setting (70d4c4f)
• multi-branch and conditional backmerges (5df3ec3)

2.0.0 (2021-10-22)

Bug Fixes

• use Git auth URL for pushing (#27) (9b76e14)

chore

• require semantic-release >=13.0.0 (13288a4)

BREAKING CHANGES

• semantic-release >=13.0.0 is set as minimum dependency to use this plugin.

1.5.3 (2021-07-20)

Bug Fixes

• git: fix -X option (0865f6e)

1.5.2 (2021-07-18)

Bug Fixes

• checkout with -B (#21) (d695ad4)

1.5.1 (2021-07-06)

Bug Fixes

• use repository url from semantic release config (f4cd9b4)

1.5.0 (2021-06-27)

Features

• add merge mode (#13) (c58f040)

1.4.2 (2021-04-12)

Bug Fixes

• revert: reverts "fix: fetch repository with URL" (#16) (e470e7a)

1.4.1 (2021-04-09)

Bug Fixes

• fetch repository with URL (#12) (2efae25)

1.4.0 (2021-03-25)

Features

• configure backmerge strategy (7098421)

1.3.0 (2021-03-25)

Features

• add options to clear and restore workspace (9bd009b)

1.2.1 (2021-01-01)

Bug Fixes

• add setting allowSameBranchMerge (#6) (138abb5)

1.2.0 (2020-09-19)

Bug Fixes

• make full branch object available to message template (b63d597)

Features

• allow merging back into the original branch (639ed4a)
• allow using branch variables in branch name option (#5) (f3d1caa)

1.1.3 (2020-07-30)

Bug Fixes

• deps: update lodash and execa to latest versions (be58ece)