Skip to content

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

Merged
spacewander merged 6 commits intotj:masterfrom
elonderin:fix-squash-help
Oct 14, 2020
Merged

Updates git-squash.md: fixes help which was unclear and had remnants …#884
spacewander merged 6 commits intotj:masterfrom
elonderin:fix-squash-help

Conversation

@elonderin
Copy link
Copy Markdown
Contributor

…from copied template it appears

Comment thread man/git-squash.md
@spacewander
Copy link
Copy Markdown
Collaborator

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

@elonderin
Copy link
Copy Markdown
Contributor Author

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

done

@spacewander
Copy link
Copy Markdown
Collaborator

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

@elonderin
Copy link
Copy Markdown
Contributor Author

elonderin commented Oct 12, 2020

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
Comment thread man/git-extras.md
@spacewander
Copy link
Copy Markdown
Collaborator

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.

Comment thread man/git-extras.html
@spacewander spacewander merged commit 171d069 into tj:master Oct 14, 2020
@spacewander
Copy link
Copy Markdown
Collaborator

@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

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants