From a3b137f44faa76533e6a3836b405449f7c9a41b8 Mon Sep 17 00:00:00 2001 From: notnull Date: Sat, 26 Jan 2019 13:13:10 -0800 Subject: [PATCH] added formatting to org/git.org --- org/git.org | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/org/git.org b/org/git.org index 7c25884..4a4d9cf 100644 --- a/org/git.org +++ b/org/git.org @@ -1,32 +1,34 @@ * Git - 1. apt install git - 2. (add git config stuff here) - 1. it would be weird if git lost track of those updates... but I probably did something stupid. - 3. create repo in gogs +** To create a repo + on gogs + 1. git config --global user.name "@whatever" + 2. create repo in gogs + + on computer + 3. apt install git 4. git clone repo 5. touch README.md 6. git add -A 7. git commit -m "first commit" 8. git push origin master - -To collaborate on an existing repo +** To collaborate on an existing repo 1. Be added as a collaborator - 2. git clone (I'll show you where to get the addy) - 3. git checkout -b + 2. git clone + 3. ~git checkout -b ~ - ~-b~ yocreates a new branch if one doesn't exist - you can name branch anything, start w/ your gogs name 4. make changes -To push up your changes - 1. git checkout master - 2. git pull origin master - 3. git checkout - 4. git merge master - 5. git add -A - 6. git commit -m "concise explanation of what I did" - 7. git push origin +** To push up your changes + 1. ~git checkout master~ + 2. ~git pull origin master~ + 3. ~git checkout ~ + 4. ~git merge master~ + 5. ~git add -A~ + 6. ~git commit -m "concise explanation of what I did"~ + 7. ~git push origin ~ 8. submit a pull request