Merge branch 'docs' of rho.la:~/wallet into docs
Conflicts: docs/setup/contributor_code_of_conduct.md
This commit is contained in:
commit
a9d34c3f0b
@ -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.
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user