Update bin/changelog to deal with cherry-picked commits. #11732
Merged
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
This allows the `bin/changelog` script to be useful in my normal beta/stable workflow (of using `git cherry-pick -x <sha>`).
rwjblue
added a commit
that referenced
this pull request
Jul 14, 2015
…-cherry-picks Update bin/changelog to deal with cherry-picked commits.
bmac
added a commit
to bmac/data
that referenced
this pull request
Jul 27, 2015
This pr port's @rwjblue's work from emberjs/ember.js#11732
bmac
added a commit
to emberjs/data
that referenced
this pull request
Jul 27, 2015
This pr port's @rwjblue's work from emberjs/ember.js#11732 (cherry picked from commit e99f5d8) Conflicts: bin/changelog
jcope2013
pushed a commit
to jcope2013/data
that referenced
this pull request
Aug 3, 2015
This pr port's @rwjblue's work from emberjs/ember.js#11732
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This allows the
bin/changelogscript to be useful in my normal beta/stable workflow (of usinggit cherry-pick -x <sha>).git cherry-pick -x <sha>'s addition of(cherry picked from commit <sha>)to track down the upstream PR.Might be ugly, but has "Works for Me" status and saves me an hour or more per beta release....