From 98a0c6a5f7093b179b4555317a6a46ff1037c8cd Mon Sep 17 00:00:00 2001 From: "reaction.la" Date: Fri, 24 Feb 2023 11:21:15 +0800 Subject: [PATCH] typos in code of conduct --- .gitconfig | 4 ++-- docs/setup/contributor_code_of_conduct.md | 17 +++++++---------- docs/setup/set_up_build_environments.md | 2 +- 3 files changed, 10 insertions(+), 13 deletions(-) diff --git a/.gitconfig b/.gitconfig index 806017c..0205c94 100644 --- a/.gitconfig +++ b/.gitconfig @@ -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 diff --git a/docs/setup/contributor_code_of_conduct.md b/docs/setup/contributor_code_of_conduct.md index 1185ba8..5c11a0d 100644 --- a/docs/setup/contributor_code_of_conduct.md +++ b/docs/setup/contributor_code_of_conduct.md @@ -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 diff --git a/docs/setup/set_up_build_environments.md b/docs/setup/set_up_build_environments.md index 4f307f6..75c5a54 100644 --- a/docs/setup/set_up_build_environments.md +++ b/docs/setup/set_up_build_environments.md @@ -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