pick-to branch: improve guidance; restore branch on error/abort, etc.#101
Closed
DDvO wants to merge 5 commits intoopenssl:masterfrom
Closed
pick-to branch: improve guidance; restore branch on error/abort, etc.#101DDvO wants to merge 5 commits intoopenssl:masterfrom
pick-to branch: improve guidance; restore branch on error/abort, etc.#101DDvO wants to merge 5 commits intoopenssl:masterfrom
Conversation
Contributor
DDvO
commented
Nov 26, 2021
DDvO
commented
- restore original commit HEAD of target on error/abort
- improve user guidance and streamline interaction
- allow 'h' or 'HEAD' as first argument, which leads to using the master HEAD
- pick-to-branch: rename 'branch' to 'target' for clarity
- restrict 'git pull --ff-only' to target branch
… using the master HEAD
1 task
Contributor
Author
|
ready to merge |
t8m
approved these changes
Dec 3, 2021
openssl-machine
pushed a commit
that referenced
this pull request
Dec 3, 2021
Reviewed-by: Paul Dale <[email protected]> Reviewed-by: Tomas Mraz <[email protected]> (Merged from #101)
openssl-machine
pushed a commit
that referenced
this pull request
Dec 3, 2021
Reviewed-by: Paul Dale <[email protected]> Reviewed-by: Tomas Mraz <[email protected]> (Merged from #101)
openssl-machine
pushed a commit
that referenced
this pull request
Dec 3, 2021
Reviewed-by: Paul Dale <[email protected]> Reviewed-by: Tomas Mraz <[email protected]> (Merged from #101)
openssl-machine
pushed a commit
that referenced
this pull request
Dec 3, 2021
… using the master HEAD Reviewed-by: Paul Dale <[email protected]> Reviewed-by: Tomas Mraz <[email protected]> (Merged from #101)
openssl-machine
pushed a commit
that referenced
this pull request
Dec 3, 2021
Reviewed-by: Paul Dale <[email protected]> Reviewed-by: Tomas Mraz <[email protected]> (Merged from #101)
Member
|
Merged. Thank you! |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.