Updates git-squash.md: fixes help which was unclear and had remnants … by elonderin · Pull Request #884 · tj/git-extras
Navigation Menu
{{ message }}
tj / git-extras Public
- Notifications You must be signed in to change notification settings
- Fork 1.2k
Merged
spacewander merged 6 commits intotj:masterfrom
Oct 14, 2020Merged
Updates git-squash.md: fixes help which was unclear and had remnants …#884
spacewander merged 6 commits intotj:masterfrom
Updates git-squash.md: fixes help which was unclear and had remnants …#884
spacewander merged 6 commits intotj:masterfrom
Conversation
Copy link Copy Markdown
Contributor
elonderin
commented
Oct 5, 2020
elonderin
commented
…from copied template it appears
…from copied template it appears
spacewander requested changes Oct 6, 2020
man/git-squash.md
Show resolved
Hide resolved
man/git-squash.md Show resolved Hide resolved
Copy link Copy Markdown
Collaborator
spacewander
commented
Oct 10, 2020
spacewander commented
Oct 10, 2020@elonderin
Since #886 has been merged instead, will you update the PR?
elonderin added 2 commits
October 11, 2020 14:12Copy link Copy Markdown
Contributor Author
elonderin
commented
Oct 11, 2020
elonderin commented
Oct 11, 2020@elonderin
Since #886 has been merged instead, will you update the PR?
done
Copy link Copy Markdown
Collaborator
spacewander
commented
Oct 12, 2020
spacewander commented
Oct 12, 2020And you need to run make man/git-squash.{html,1} to regenerated the doc.
Copy link Copy Markdown
Contributor Author
done also that.
btw:
- shoundn't that step be mentioned in
CONTRIBUTING.md? - also: b/c
ronnis 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
requested a review
from spacewander
spacewander requested changes Oct 12, 2020
man/git-extras.md
Show resolved
Hide resolved
man/git-extras.md Show resolved Hide resolved
Copy link Copy Markdown
Collaborator
spacewander
commented
Oct 12, 2020
spacewander commented
Oct 12, 2020shoundn'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 reviewed Oct 13, 2020
man/git-extras.html
Show resolved
Hide resolved
man/git-extras.html Show resolved Hide resolved
spacewander approved these changes Oct 14, 2020
spacewander
merged commit
171d069
into
tj:master
Copy link Copy Markdown
Collaborator
spacewander
commented
Oct 14, 2020
spacewander commented
Oct 14, 2020@elonderin
Merged. Thanks!
elonderin
deleted the
fix-squash-help
branch
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