This repository has been archived by the owner on Jan 12, 2019. It is now read-only.
Add an option to accept patches without squashing #287
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
It can actually be more confusing to squash commits in simple PRs so offer the ability to accept them without squashing.
|
LGTM |
Align command descriptions.
Don't fast-forward merges.
| { "prompt": "text", "id": "line", "desc": "Describe this change in one line" }, | ||
| [ "grunt chg-add:'{{line}} ([view](https\\://github.com/{{meta.org}}/{{meta.name}}/pull/{{prNum}}))'", "Add a line to the changelog" ], | ||
| [ "git add CHANGELOG.md", "Add the changlelog change to be committed" ], | ||
| [ "git commit -a --author='{{prCommits.[0].commit.author.name}} <{{prCommits.[0].commit.author.email}}>' -m '{{line}}. closes #{{prNum}}'", "Commit the changes" ], |
There was a problem hiding this comment.
If you know there's going to be a merge commit, you might be able to do a git commit --amend and add the changelog change and the message to the merge commit, saving an additional commit. Though I'm not exactly sure how you might prepend to the commit message.
There was a problem hiding this comment.
Possibly --reedit-message=<commit>. But also how you have it now is perfectly fine.
There was a problem hiding this comment.
Good point, it would be nice to piggyback the changelog onto the merge commit.
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
It can actually be more confusing to squash commits in simple PRs so offer the ability to accept them without squashing.