added info about checking out branches
This commit is contained in:
parent
0a7ef1ab87
commit
794fbbf944
30
org/git.org
30
org/git.org
@ -1,21 +1,33 @@
|
|||||||
* Git
|
* Git
|
||||||
|
|
||||||
1. apt install git
|
1. apt install git
|
||||||
2. create repo in gogs
|
2. (add git config stuff here)
|
||||||
3. git clone repo
|
1. it would be weird if git lost track of those updates... but I probably did something stupid.
|
||||||
4. touch README.md
|
3. create repo in gogs
|
||||||
5. git add -A
|
4. git clone repo
|
||||||
6. git commit -m "first commit"
|
5. touch README.md
|
||||||
7. git push origin master
|
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
|
1. Be added as a collaborator
|
||||||
2. git clone <repo> (I'll show you where to get the addy)
|
2. git clone <repo> (I'll show you where to get the addy)
|
||||||
3. git checkout -b <your name>
|
3. git checkout -b <branchname>
|
||||||
|
- ~-b~ yocreates a new branch if one doesn't exist
|
||||||
|
- you can name branch anything, start w/ your gogs name
|
||||||
4. make changes
|
4. make changes
|
||||||
5. add commit
|
|
||||||
6. git push origin <yourname>
|
To push up your changes
|
||||||
|
1. git checkout master
|
||||||
|
2. git pull origin master
|
||||||
|
3. git checkout <branchname>
|
||||||
|
4. git merge master
|
||||||
|
5. git add -A
|
||||||
|
6. git commit -m "concise explanation of what I did"
|
||||||
|
7. git push origin <yourname>
|
||||||
|
8. submit a pull request
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user