From e6475b2f9f1ddd52768a4e54c2bd6c3fdf4ca61b Mon Sep 17 00:00:00 2001 From: libBletchley Date: Sat, 20 Jul 2019 15:04:25 -0400 Subject: formatting --- instructions_git.md | 57 ++++++++++++++++++++++++++++++++--------------------- 1 file changed, 34 insertions(+), 23 deletions(-) diff --git a/instructions_git.md b/instructions_git.md index 1e8f16b3..fff77ab1 100644 --- a/instructions_git.md +++ b/instructions_git.md @@ -37,29 +37,40 @@ need more adaptations for Windows and other platforms. merge = refs/heads/master ``` -
    -
  1. install Git, SSH(Not Windows), and Tor (if you haven't already) -
  2. create a `codeberg.org` account (username "snowden" will be used for this example) -
  3. create an SSH key pair `$ ssh-keygen -t rsa -N '' -C 'snowden at codeberg' -f "$HOME"/.ssh/id_rsa_codeberg-snowden` -
  4. edit `$HOME/.ssh/config`[1] -
  5. copy `"$HOME"/.ssh/id_rsa_codeberg-snowden.pub` to clipboard -
  6. codeberg.org > settings > SSH/GPG Keys > add key (paste from clipboard) -
  7. $ `firefox https://codeberg.org/crimeflare/cloudflare-tor` -
  8. fork it (top right corner) -
  9. go to the directory you want the project to be rooted in (hereafter we'll call it `$project_root`). -
  10. anonymously download your fork: $ `torsocks git clone https://codeberg.org/snowden/cloudflare-tor` -
  11. edit `$project_root/cloudflare-tor/.git/config` to include the - account name and email address that will be on every commit, as - well as the URL[2] -
  12. make your first change -
  13. (from `$project_root`) $ `git add . -u -n` -
  14. check that the files listed are what you changed and intend to push upstream -
  15. if yes: `$ git add . -u` -
  16. $ `git commit -m 'description of first change'` -
  17. $ `git push origin master` -
  18. $ `firefox https://codeberg.org/crimeflare/cloudflare-tor` -
  19. make a new pull request -
+1. install Git, SSH(Not Windows), and Tor (if you haven't already) +1. create a `codeberg.org` account (username "snowden" will be used for this example) +1. create an SSH key pair `$ ssh-keygen -t rsa -N '' -C 'snowden at codeberg' -f "$HOME"/.ssh/id_rsa_codeberg-snowden` +1. edit `$HOME/.ssh/config`[1] +1. copy `"$HOME"/.ssh/id_rsa_codeberg-snowden.pub` to clipboard +1. codeberg.org > settings > SSH/GPG Keys > add key (paste from clipboard) +1. $ `firefox https://codeberg.org/crimeflare/cloudflare-tor` +1. fork it (top right corner) +1. go to the directory you want the project to be rooted in (hereafter we'll call it `$project_root`). +1. anonymously download your fork: $ `torsocks git clone https://codeberg.org/snowden/cloudflare-tor` +1. edit `$project_root/cloudflare-tor/.git/config` to include the account name and email address that will be on every commit, as well as the URL[2] +``` +[user] + email = BM-yadayadayada6fgnLfybVnCcWf25AGZcgg@bitmessage.ch + name = snowden +[remote "origin"] + url = git@codeberg-snowden:snowden/cloudflare-tor.git + fetch = +refs/heads/*:refs/remotes/origin/* +[remote "upstream"] + url = git@codeberg-snowden:crimeflare/cloudflare-tor.git + fetch = +refs/heads/*:refs/remotes/origin/* +[branch "master"] + remote = origin + merge = refs/heads/master +``` + +1. make your first change +1. (from `$project_root`) $ `git add . -u -n` +1. check that the files listed are what you changed and intend to push upstream +1. if yes: `$ git add . -u` +1. $ `git commit -m 'description of first change'` +1. $ `git push origin master` +1. $ `firefox https://codeberg.org/crimeflare/cloudflare-tor` +1. make a new pull request   -- cgit v1.2.3