Skip to content

Updates git-squash.md: fixes help which was unclear and had remnants … #884

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
Merged
spacewander merged 6 commits into from
Oct 14, 2020
Merged

Updates git-squash.md: fixes help which was unclear and had remnants … #884

spacewander merged 6 commits into from
Oct 14, 2020

Conversation

@elonderin
Copy link
Contributor

@elonderin elonderin commented Oct 5, 2020

…from copied template it appears

spacewander
spacewander requested changes Oct 6, 2020
View reviewed changes
@spacewander
Copy link
Collaborator

spacewander commented Oct 10, 2020

@elonderin
Since #886 has been merged instead, will you update the PR?

@elonderin
Copy link
Contributor Author

elonderin commented Oct 11, 2020

@elonderin
Since #886 has been merged instead, will you update the PR?

done

@spacewander
Copy link
Collaborator

spacewander commented Oct 12, 2020

And you need to run make man/git-squash.{html,1} to regenerated the doc.

@elonderin
Copy link
Contributor Author

elonderin commented Oct 12, 2020 •
edited
Loading

done also that.

btw:

  • shoundn't that step be mentioned in CONTRIBUTING.md ?
  • also: b/c ronn is not available in my git windows install i had to go to WSL, install the damn ting and then run it. Hence, plz have a CI that does that automatically

@elonderin elonderin requested a review from spacewander October 12, 2020 05:56
spacewander
spacewander requested changes Oct 12, 2020
View reviewed changes
@spacewander
Copy link
Collaborator

spacewander commented Oct 12, 2020

shoundn't that step be mentioned in CONTRIBUTING.md

We will add it later.

Hence, plz have a CI that does that automatically

This requires a GitHub bot to commit the output into this repo or store it something. However we don't have the right/resource to do it yet.

spacewander
spacewander reviewed Oct 13, 2020
View reviewed changes
@spacewander spacewander merged commit 171d069 into tj:master Oct 14, 2020
@spacewander
Copy link
Collaborator

spacewander commented Oct 14, 2020

@elonderin
Merged. Thanks!

@elonderin elonderin deleted the fix-squash-help branch October 30, 2025 12:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@spacewander spacewander spacewander approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@elonderin @spacewander