CONTRIBUTING.md: simplify rebasing instructions#175352
Merged
piegamesde merged 1 commit intoNixOS:masterfrom Aug 15, 2022
Merged
CONTRIBUTING.md: simplify rebasing instructions#175352piegamesde merged 1 commit intoNixOS:masterfrom
piegamesde merged 1 commit intoNixOS:masterfrom
Conversation
Makes the instructions easier to remember (and type) using the `git rebase --onto A...B` syntax to find the merge base between A and B (which has been in git for at least 10 years). We also assume that the merge base between staging and master is also the merge base between staging and the current branch (since it is based on master), and giving master as the <upstream> branch makes git consider the commits in the current branch that are not in master, so there's no need to compute the merge base between master and the current branch. In the same spirit of discouraging copy-and-paste, use a placeholder name for the current branch instead of `$(git branch --show-current)`.
13 tasks
ofborg
bot
added
10.rebuild-darwin: 0
jonringer
reviewed
May 30, 2022
jonringer
approved these changes
Jun 3, 2022
bobby285271
added
the
12.approvals: 1
Member
Author
|
bump |
Contributor
|
cc some others who might be opinionated |
Member
Author
|
ping |
Member
|
The triple dot syntax is documented in I am not very familiar with merges in git so I will defer to others. |
Member
Author
|
Indeed, the
At least I've never run into that issue in nixpkgs. |
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
5 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.
Makes the instructions easier to remember (and type) using the
git rebase --onto A...Bsyntax to find the merge base between A and B (which has been in git for at least 10 years).We also assume that the merge base between staging and master is also the merge base between staging and the current branch (since it is based on master)
Also, giving master as the
<upstream>branch makes git consider the commits in the current branch that are not in master, so there's no need to compute the merge base between master and the current branch.In the same spirit of discouraging copy-and-paste, use a placeholder name for the current branch instead of
$(git branch --show-current).