extern/nix-config
1
0
Fork 1
mirror of https://github.com/donovanglover/nix-config.git synced 2025-02-22 20:50:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add more information about using branches to git.md

Browse Source
This commit is contained in:
Donovan Glover 2017-11-23 18:23:44 -05:00
parent d2b1fa42d7
commit 2072f06223
No known key found for this signature in database
GPG Key ID: 8FC5F7D90A5D8F4D
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
help/git.md
View File

@ -38,7 +38,12 @@ Also note that `git clone` makes a remote name of `origin` by default. This is w
- Checkout a different branch: `git checkout <branch>`
- Useful for 1) checking out the master or development branch, 2) checking out an upstream branch, and 3) checking out a feature branch
- Create a new branch: `git checkout -b <branch>`
- Use `<group>/<description>` to describe your branches
- For example, a fix for a compiler issue should have a branch name of `fix/description-of-compiler-issue`
- Note that the branch should be descriptive but not too long (i.e. don't make it longer than above, since the example above is pretty long already)
- Always create a new branch when submitting pull requests. This allows you to create multiple pull requests for different issues, prevent conflicts between your master branch and upstream, as well as some other things.
- Delete a branch when you're done with it: `git branch -d <branch>`
- Push your changes to a different branch (i.e. your new branch): `git push origin <branch>` **OR** `gp origin <branch>`
## Less common commands