cheng/wallet
0
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

typos in code of conduct

Browse Source
This commit is contained in:
reaction.la 2023-02-24 11:21:15 +08:00
parent a9d34c3f0b
commit 98a0c6a5f7
No known key found for this signature in database
GPG Key ID: 99914792148C8388
3 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitconfig
View File

@ -6,8 +6,8 @@
whitespace = fix
ignoreWhitespace = no
[alias]
lg = log --max-count=6 --oneline --pretty='format:%C(auto)%h %d %Creset%p %C("#60A0FF")%cr %Cgreen %cn %G? %GT trust%Creset%n%s%n'
graph = log --max-count=18 --graph --pretty=format:'%C(auto)%h %s %Cgreen(%cr) %C(bold blue)%cn %G?%Creset' --abbrev-commit
lg = log --max-count=6 --pretty=format:'%C(auto)%h %d %Creset %p %C("#60A0FF")%cr %Cgreen %cn %G? %GT trust%Creset%n %<(78,trunc)%s%n'
graph = log --max-count=38 --graph --pretty=format:'%C(auto)%h %<(78,trunc)%s %Cgreen(%cr) %C(bold blue)%cn %G?%Creset' --abbrev-commit
alias = ! git config --get-regexp ^alias\\. | sed -e s/^alias\\.// -e s/\\ /\\ =\\ / | grep -v ^'alias ' | sort
[commit]
gpgSign = true

17
docs/setup/contributor_code_of_conduct.md
View File

@ -83,24 +83,21 @@ tagged commit by the person requesting.
When creating the tag for a pull request, git drops one into an editor and
asks one to describe the tag. One should then give a lengthy description of
one's pull request documenting the changes made. Or, better, the tag
should already contain a lengthy description of the pull request containing
the changes made.
one's pull request documenting the changes made.
When accepting a pull request, the information provided by the requestor
through the tag and elsewhere should be duplicated by the acceptor into
the (possibly quite lengthy) merge message. Or, better, if he can fast
forward the pull request, the tag will be the merge message, which will
lead to git recording a more intelligible and linear project history.
the (possibly quite lengthy) merge message.
Thus all changes should be made, explained, and approved by persons
identified cryptographically, rather than through the domain name system.
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
history, which is likely to be more intelligible and informative than the
actual history. In particular, more intelligible to the person pulling.
changes in the branch that you want pulled to the most recent version
signed by the puller 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 actual history. In particular, more
intelligible to the person who has been requested to pull.
# No race, sex, religion, nationality, or sexual preference

2
docs/setup/set_up_build_environments.md
View File

@ -77,7 +77,7 @@ sudo -i
apt-get -qy update && apt-get -qy install build-essential module-assistant git dnsutils curl sudo dialog rsync
apt-get -qy full-upgrade
m-a -qi prepare
apt autoremove
apt autoremove -qy
mount /media/cdrom0
cd /media/cdrom0 && sh ./VBoxLinuxAdditions.run
usermod -a -G vboxsf cherry