sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-25 12:02:48 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge #13488: Docs: Improve readability of "Squashing commits"

Browse Source 
42c499614a Docs: Improve readability of "Squashing commits" (wodry)

Pull request description:

  It was not easy to read the comment lines for me because I was not sure whether the sentence ended with the line or not ("pull set commits"?).
  Therefore, dots had been invented and I have added them to signal the end of a sentence. Also begin New sentence with a capital letter.

  I guess, not all 'pick' words should be replaced by 'squash'? At least I found [this DO](https://www.digitalocean.com/community/tutorials/how-to-rebase-and-update-a-pull-request) rebase/squash documentation helpful, where is written that the first line should not be changed.

Tree-SHA512: 1cb6d866a7295d44e2c8a7911f8a2650eb2f0ba0cffe2b97e90f7e1ed36ac942480b45ef46e01dd3871beb20d04840fb5093fdb414b60f6cc4f88f95fe70f47b
This commit is contained in:
MarcoFalke 2018-06-17 08:36:36 -04:00 committed by pasta
parent d1200755f1
commit 38f90834cc
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CONTRIBUTING.md
View File

@ -106,10 +106,10 @@ before it will be merged. The basic squashing workflow is shown below.
git checkout your_branch_name git checkout your_branch_name
git rebase -i HEAD~n git rebase -i HEAD~n
# n is normally the number of commits in the pull # n is normally the number of commits in the pull request.
# set commits from 'pick' to 'squash', save and quit # Set commits (except the one in the first line) from 'pick' to 'squash', save and quit.
# on the next screen, edit/refine commit messages # On the next screen, edit/refine commit messages.
# save and quit # Save and quit.
git push -f # (force push to GitHub) git push -f # (force push to GitHub)
If you have problems with squashing (or other workflows with `git`), you can If you have problems with squashing (or other workflows with `git`), you can