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.

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

[doc][trivial] Add basic git squash workflow [skip ci] #8034

Merged
merged 1 commit into from May 26, 2016

Conversation

Projects
None yet
8 participants
@fanquake
Member

fanquake commented May 10, 2016

Fixes #8032

@MarcoFalke

View changes

Show outdated Hide outdated CONTRIBUTING.md
@MarcoFalke

View changes

Show outdated Hide outdated CONTRIBUTING.md
@MarcoFalke

This comment has been minimized.

Show comment
Hide comment
@MarcoFalke

MarcoFalke May 10, 2016

Member

It might be worth to mention that squashing is not required when the commits each have a different "topic"/task and are not fixup commits.

Also, it might come in handy to add section headings, so it is easier to link to a section...

Concept ACK.

Member

MarcoFalke commented May 10, 2016

It might be worth to mention that squashing is not required when the commits each have a different "topic"/task and are not fixup commits.

Also, it might come in handy to add section headings, so it is easier to link to a section...

Concept ACK.

@MarcoFalke MarcoFalke added the Docs label May 10, 2016

@laanwj

This comment has been minimized.

Show comment
Hide comment
@laanwj

laanwj May 10, 2016

Member

Concept ACK, this was long overdue, somehow I was not lazy enough describe this again in every new contributor's pull, but too lazy to add it into here :) Thanks for doing so.

Member

laanwj commented May 10, 2016

Concept ACK, this was long overdue, somehow I was not lazy enough describe this again in every new contributor's pull, but too lazy to add it into here :) Thanks for doing so.

@laanwj

View changes

Show outdated Hide outdated CONTRIBUTING.md

@fanquake fanquake changed the title from [doc][trivial] Add basic git squash workflow to [doc][trivial] Add basic git squash workflow [skip ci] May 10, 2016

@laanwj

This comment has been minimized.

Show comment
Hide comment
@laanwj

laanwj May 10, 2016

Member

BTW: the [skip ci] did'n't work. I think you need to put it in the commit message, unfortunately.
(doesn't have to be in the first line though, luckily)

Member

laanwj commented May 10, 2016

BTW: the [skip ci] did'n't work. I think you need to put it in the commit message, unfortunately.
(doesn't have to be in the first line though, luckily)

@MarcoFalke

This comment has been minimized.

Show comment
Hide comment
@MarcoFalke
Member

MarcoFalke commented May 10, 2016

utACK 90963e5

@paveljanik

This comment has been minimized.

Show comment
Hide comment
@paveljanik

paveljanik May 10, 2016

Contributor

utACK 90963e5

Contributor

paveljanik commented May 10, 2016

utACK 90963e5

@achow101

This comment has been minimized.

Show comment
Hide comment
@achow101
Member

achow101 commented May 11, 2016

utACK 90963e5

@petertodd

This comment has been minimized.

Show comment
Hide comment
@petertodd

petertodd May 20, 2016

Contributor

utACK 90963e5

Contributor

petertodd commented May 20, 2016

utACK 90963e5

@paveljanik

This comment has been minimized.

Show comment
Hide comment
@paveljanik

paveljanik May 24, 2016

Contributor

This is ready for merge.

Contributor

paveljanik commented May 24, 2016

This is ready for merge.

@arowser

This comment has been minimized.

Show comment
Hide comment
@arowser

arowser May 25, 2016

Contributor

Can one of the admins verify this patch?

Contributor

arowser commented May 25, 2016

Can one of the admins verify this patch?

@laanwj laanwj merged commit 90963e5 into bitcoin:master May 26, 2016

1 of 2 checks passed

continuous-integration/travis-ci/push The Travis CI build is in progress
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

laanwj added a commit that referenced this pull request May 26, 2016

Merge #8034: [doc][trivial] Add basic git squash workflow [skip ci]
90963e5 [doc] Add basic git squash example (fanquake)

@fanquake fanquake deleted the fanquake:contrib-squash branch May 26, 2016

codablock added a commit to codablock/dash that referenced this pull request Sep 16, 2017

codablock added a commit to codablock/dash that referenced this pull request Sep 19, 2017

codablock added a commit to codablock/dash that referenced this pull request Dec 21, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment