diff --git a/instructions_git.md b/instructions_git.md index e5580ec0e..9a6dff465 100644 --- a/instructions_git.md +++ b/instructions_git.md @@ -7,15 +7,12 @@ for ***linux***. The first step covers Windows too, but these instructions probably need more adaptations for Windows and other platforms. -
    -
  1. install git, ssh, and tor (if you haven't already) -| Debian | Windows | -| --- | --- | -| `aptitude install git tor ssh` | (git only) download and extract `https://github.com/git-for-windows/git/releases/PortableGit-2.21.0-64-bit.7z`; run `git-bash.exe` | -
  2. create a `notabug.org` account (username "snowden" will be used for this example) -
  3. create an SSH key pair ``` - $ ssh-keygen -t rsa -N '' -C 'snowden at notabug' -f "$HOME"/.ssh/id_rsa_nab-snowden``` -
  4. edit `$HOME/.ssh/config`: + +- Linux: `aptitude install git tor ssh` +- Windows: Download `https://github.com/git-for-windows/git/releases/PortableGit-2.21.0-64-bit.7z` & run `git-bash.exe` + + +[1] ``` host notabug-* hostname qs3zumwfci4tntnd.onion @@ -24,16 +21,8 @@ platforms. host notabug-snowden IdentityFile /home/user/.ssh/id_rsa_nab-snowden ``` -
  5. copy `"$HOME"/.ssh/id_rsa_nab-snowden.pub` to clipboard -
  6. notabug.org > settings > SSH Keys > add key (paste from clipboard) -
  7. $ `firefox https://notabug.org/themusicgod1/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://notabug.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] ``` [user] email = BM-yadayadayada6fgnLfybVnCcWf25AGZcgg@bitmessage.ch @@ -46,13 +35,27 @@ platforms. merge = refs/heads/master ``` +
      +
    1. install Git, SSH(Not Windows), and Tor (if you haven't already) +
    2. create a `notabug.org` account (username "snowden" will be used for this example) +
    3. create an SSH key pair `$ ssh-keygen -t rsa -N '' -C 'snowden at notabug' -f "$HOME"/.ssh/id_rsa_nab-snowden` +
    4. edit `$HOME/.ssh/config`[1] +
    5. copy `"$HOME"/.ssh/id_rsa_nab-snowden.pub` to clipboard +
    6. notabug.org > settings > SSH Keys > add key (paste from clipboard) +
    7. $ `firefox https://notabug.org/themusicgod1/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://notabug.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://notabug.org/themusicgod1/cloudflare-tor` +
    19. $ `firefox https://notabug.org/crimeflare/cloudflare-tor`
    20. make a new pull request