Releases: sorenlouv/backport
5.1.1 Improved heuristic for finding backported pull requests
5.1.0 Improved merge conflict resolution
When a conflict happens:
- A list of the conflicting files will be displayed
- If configured (via
"editor"
property) the conflicting files will be opened in the user's preferred editor - When resolved, the user can return to the
backport
terminal. The user does not have to stage (git add
) or commit their changes -backport
will do this for them when they agree to proceed. - The backport process will continue as usual: the branch will be pushed and a PR created.
Added in #170
5.0.0 Remove option `apiHostname` and add `githubApiBaseUrlV3` and `githubApiBaseUrlV4`
The option apiHostname
is primarily consumed by Github Enterprise users. They will instead have to specify two options: githubApiBaseUrlV3
and githubApiBaseUrlV4
.
Fixes:
- ensure that
backport -v
andbackport --version
are equivalent (#163)
4.9.0 Send access token via auth header instead of query params
Since Github is deprecating sending access token via query param it should be sent over auth header instead.
4.8.0 Add `--sourceBranch` option to backport from non-master branches
By default the list of commits will be sourced from the repository's default branch (mostly "master"). sourceBranch
can be used to list and backport commits from other branches than the default.
Configuration:
// Example .backportrc.json
{
"sourceBranch": "7.x"
}
CLI: --sourceBranch 7.x
Add `--backport-created-labels` options
This adds the option --backport-created-labels
which makes it possible to add labels to the original PR after backport PRs have been created.
// Example .backportrc.json
{
"upstream": "elastic/kibana",
"backportCreatedLabels": ["backport-created"],
"labels": ["backport"]
}
4.7.0 Add log library and `--verbose` option
It's now possible to debug backport
by looking at the logs in ~/.backport/backport.log
. By default only high-level info will be logged. By using backport --verbose
more detailed information will be available.
4.6.6 Add `--reset-author` option
Adds --reset-author
flag which makes it possible to change the commit author to yourself.
This is useful when the original commit was made by a bot and a CLA check needs to be bypassed.
Example usage:
backport --reset-author
4.6.5 Add `--pr` option
Adds --pr
option which makes it possible to backport a commit by referencing the pull request that merged it.
Usage:
backport --pr 1337
Implemented in #145
4.6.4 Add `path` option
The --path
option makes it possible to only list commits that touches files under a specified path.
Example usage:
backport --all --path x-pack/legacy/plugins/apm