Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

doc: Explain rebase policy in CONTRIBUTING.md #18283

Merged
merged 1 commit into from
Mar 11, 2020
Merged

doc: Explain rebase policy in CONTRIBUTING.md #18283

merged 1 commit into from
Mar 11, 2020

Conversation

maflcko
Copy link
Member

@maflcko maflcko commented Mar 6, 2020

No description provided.

jonatack
jonatack reviewed Mar 6, 2020
View reviewed changes
Copy link
Member

@jonatack jonatack left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK modulo typo

CONTRIBUTING.md Outdated Show resolved Hide resolved
@fanquake fanquake added the Docs label Mar 6, 2020
@sanjaykdragon
Copy link
Contributor

Unrelated, but what is the point of squashing commits?

@maflcko
Copy link
Member Author

maflcko commented Mar 6, 2020

@sanjaykdragon Explained in the latest force push

@fanquake
Copy link
Member

fanquake commented Mar 6, 2020

Is this an alternative to #17940?

@maflcko
Copy link
Member Author

maflcko commented Mar 7, 2020

@fanquake Wasn't planned, but I see that they are mostly overlapping.

@cvengler
Copy link
Contributor

cvengler commented Mar 8, 2020 •
edited
Loading

ACK faecaf8
Good to have this for new contributors who are not that familiar with git and our git policy

hebasto
hebasto reviewed Mar 11, 2020
View reviewed changes
Copy link
Member

@hebasto hebasto left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK faecaf8 modulo typo.

CONTRIBUTING.md Outdated Show resolved Hide resolved
jonatack
jonatack reviewed Mar 11, 2020
View reviewed changes
CONTRIBUTING.md Outdated Show resolved Hide resolved
@maflcko
Copy link
Member Author

maflcko commented Mar 11, 2020

Fixed typos as requested by @jonatack and @hebasto

@hebasto
Copy link
Member

hebasto commented Mar 11, 2020

re-ACK fa12447, typos fixed.

jonatack
jonatack reviewed Mar 11, 2020
View reviewed changes
Copy link
Member

@jonatack jonatack left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK

CONTRIBUTING.md
The `git rebase` command will take care of rebuilding your commits on top of the new base.

This project aims to have a clean git history, where code changes are only made in non-merge commits. This simplifies
auditability because merge commits can be assumed to not contain arbitrary code changes. Merge commits should be signed,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

maybe s/auditability/auditing/ but doesn't really matter

@laanwj
Copy link
Member

laanwj commented Mar 11, 2020

ACK fa12447

@laanwj laanwj merged commit 414f6c4 into bitcoin:master Mar 11, 2020
@maflcko maflcko deleted the 2003-docRebase branch March 11, 2020 16:41
@maflcko maflcko mentioned this pull request Mar 19, 2020
Closed
@MarkLTZ MarkLTZ mentioned this pull request Apr 4, 2020
Closed
PastaPastaPasta pushed a commit to PastaPastaPasta/dash that referenced this pull request Jun 27, 2021
@laanwj @PastaPastaPasta
Merge bitcoin#18283: doc: Explain rebase policy in CONTRIBUTING.md
16b0fc1 
fa12447 doc: Explain rebase/squash policy in CONTRIBUTING.md (MarcoFalke)

Pull request description:

ACKs for top commit:
  hebasto:
    re-ACK fa12447, typos fixed.
  laanwj:
    ACK fa12447

Tree-SHA512: b8f790a8ffa4f59f26b64befbea8acd92f3c548e577c35750a60dde94b4340258a540ad0db60a6de650db0156cbff9e1330c589c300db5253531fe6a16cdbcc9
PastaPastaPasta pushed a commit to PastaPastaPasta/dash that referenced this pull request Jun 28, 2021
@laanwj @PastaPastaPasta
Merge bitcoin#18283: doc: Explain rebase policy in CONTRIBUTING.md
c444234 
fa12447 doc: Explain rebase/squash policy in CONTRIBUTING.md (MarcoFalke)

Pull request description:

ACKs for top commit:
  hebasto:
    re-ACK fa12447, typos fixed.
  laanwj:
    ACK fa12447

Tree-SHA512: b8f790a8ffa4f59f26b64befbea8acd92f3c548e577c35750a60dde94b4340258a540ad0db60a6de650db0156cbff9e1330c589c300db5253531fe6a16cdbcc9
PastaPastaPasta pushed a commit to PastaPastaPasta/dash that referenced this pull request Jun 29, 2021
@laanwj @PastaPastaPasta
Merge bitcoin#18283: doc: Explain rebase policy in CONTRIBUTING.md
10db7b9 
fa12447 doc: Explain rebase/squash policy in CONTRIBUTING.md (MarcoFalke)

Pull request description:

ACKs for top commit:
  hebasto:
    re-ACK fa12447, typos fixed.
  laanwj:
    ACK fa12447

Tree-SHA512: b8f790a8ffa4f59f26b64befbea8acd92f3c548e577c35750a60dde94b4340258a540ad0db60a6de650db0156cbff9e1330c589c300db5253531fe6a16cdbcc9
PastaPastaPasta pushed a commit to PastaPastaPasta/dash that referenced this pull request Jul 1, 2021
@laanwj @PastaPastaPasta
Merge bitcoin#18283: doc: Explain rebase policy in CONTRIBUTING.md
6646356 
fa12447 doc: Explain rebase/squash policy in CONTRIBUTING.md (MarcoFalke)

Pull request description:

ACKs for top commit:
  hebasto:
    re-ACK fa12447, typos fixed.
  laanwj:
    ACK fa12447

Tree-SHA512: b8f790a8ffa4f59f26b64befbea8acd92f3c548e577c35750a60dde94b4340258a540ad0db60a6de650db0156cbff9e1330c589c300db5253531fe6a16cdbcc9
PastaPastaPasta pushed a commit to PastaPastaPasta/dash that referenced this pull request Jul 1, 2021
@laanwj @PastaPastaPasta
Merge bitcoin#18283: doc: Explain rebase policy in CONTRIBUTING.md
101e2ba 
fa12447 doc: Explain rebase/squash policy in CONTRIBUTING.md (MarcoFalke)

Pull request description:

ACKs for top commit:
  hebasto:
    re-ACK fa12447, typos fixed.
  laanwj:
    ACK fa12447

Tree-SHA512: b8f790a8ffa4f59f26b64befbea8acd92f3c548e577c35750a60dde94b4340258a540ad0db60a6de650db0156cbff9e1330c589c300db5253531fe6a16cdbcc9
PastaPastaPasta pushed a commit to PastaPastaPasta/dash that referenced this pull request Jul 14, 2021
@laanwj @PastaPastaPasta
Merge bitcoin#18283: doc: Explain rebase policy in CONTRIBUTING.md
964a49b 
fa12447 doc: Explain rebase/squash policy in CONTRIBUTING.md (MarcoFalke)

Pull request description:

ACKs for top commit:
  hebasto:
    re-ACK fa12447, typos fixed.
  laanwj:
    ACK fa12447

Tree-SHA512: b8f790a8ffa4f59f26b64befbea8acd92f3c548e577c35750a60dde94b4340258a540ad0db60a6de650db0156cbff9e1330c589c300db5253531fe6a16cdbcc9
PastaPastaPasta pushed a commit to PastaPastaPasta/dash that referenced this pull request Jul 14, 2021
@laanwj @PastaPastaPasta
Merge bitcoin#18283: doc: Explain rebase policy in CONTRIBUTING.md
9c6b782 
fa12447 doc: Explain rebase/squash policy in CONTRIBUTING.md (MarcoFalke)

Pull request description:

ACKs for top commit:
  hebasto:
    re-ACK fa12447, typos fixed.
  laanwj:
    ACK fa12447

Tree-SHA512: b8f790a8ffa4f59f26b64befbea8acd92f3c548e577c35750a60dde94b4340258a540ad0db60a6de650db0156cbff9e1330c589c300db5253531fe6a16cdbcc9
@bitcoin bitcoin locked as resolved and limited conversation to collaborators Feb 15, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@jonatack jonatack jonatack left review comments

@hebasto hebasto hebasto left review comments

Assignees
No one assigned
Labels
Docs
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@maflcko @sanjaykdragon @fanquake @cvengler @hebasto @laanwj @jonatack