diff --git a/org/git.org b/org/git.org index 6c56893..7c25884 100644 --- a/org/git.org +++ b/org/git.org @@ -1,21 +1,33 @@ * Git 1. apt install git - 2. create repo in gogs - 3. git clone repo - 4. touch README.md - 5. git add -A - 6. git commit -m "first commit" - 7. git push origin master + 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 + 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 1. Be added as a collaborator 2. git clone (I'll show you where to get the addy) - 3. git checkout -b + 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 - 5. add commit - 6. 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