fred/wallet
1
0
Fork 0
forked from cheng/wallet
Code Pull Requests Activity

Merge branch 'docs' of rho.la:~/wallet into docs

Browse Source 
Conflicts:
	docs/setup/contributor_code_of_conduct.md
This commit is contained in:
reaction.la 2023-02-19 15:24:36 +08:00
commit a9d34c3f0b
No known key found for this signature in database
GPG Key ID: 99914792148C8388
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docs/setup/contributor_code_of_conduct.md
View File

@ -97,7 +97,8 @@ Thus all changes should be made, explained, and approved by persons
identified cryptographically, rather than through the domain name system. identified cryptographically, rather than through the domain name system.
It is preferable to simplify the history recorded in git by rebasing the It is preferable to simplify the history recorded in git by rebasing the
changes in the branch that you want pulled to the most recent version of the branch that you want it pulled into. This produces an artificially linear changes in the branch that you want pulled to the most recent version of
the branch that you want it pulled into. This produces an artificially linear
history, which is likely to be more intelligible and informative than the history, which is likely to be more intelligible and informative than the
actual history. In particular, more intelligible to the person pulling. actual history. In particular, more intelligible to the person pulling.