Skip to content

Commit

Permalink
squash!: remove commit message changes
Browse files Browse the repository at this point in the history
Following on from discussion in:
nodejs/Release#191
the backport PR should start with the same commit message. Any
additions can be made by whoever lands the PR.
  • Loading branch information
gibfahn authored Apr 12, 2017
1 parent fc434b2 commit a374208
Showing 1 changed file with 2 additions and 31 deletions.
33 changes: 2 additions & 31 deletions doc/guides/backporting-to-release-lines.md
Original file line number Diff line number Diff line change
Expand Up @@ -71,41 +71,12 @@ hint: and commit the result with 'git commit'
* Make the required changes to remove the conflicts, add the files to the index
using `git add`, and then commit the changes. That can be done with
`git cherry-pick --continue`.
* The commit message should be as close as possible to the commit message on the
master branch, unless the commit has to be different due to dependencies that
are not present in the targeted release line. The only exception is that the
metadata from the original commit should be removed. If a backport is
required, it should go through the same review steps as a commit landing
in the master branch.
* Leave the commit message as is. If you think it should be modified, comment
in the Pull Request.
* Make sure `make -j4 test` passes
* Push the changes to your fork and open a pull request.
* Be sure to target the `v7.x-staging` branch in the pull request.

Below are examples of an original commit message and a backport commit message.

In this example, https://github.com/nodejs/node/pull/1234 is the original pull
request and https://github.com/nodejs/node/pull/5678 is the backport.

Original:

```
lib: make something faster
Switch to using String#repeat to improve performance.
PR-URL: https://github.com/nodejs/node/pull/1234
```

Backport:

```
lib: make something faster
Switch to using String#repeat to improve performance.
PR-URL: https://github.com/nodejs/node/pull/1234
```

### Helpful Hints

* Please include the backport target in the pull request title in the following
Expand Down

0 comments on commit a374208

Please sign in to comment.