holm/donovanglover-nix-config
1
0
Fork 0
forked from extern/nix-config
Code Pull Requests Activity

Add Updating a Forked Repository to git.md

Browse Source
This commit is contained in:
Donovan Glover 2017-12-05 23:39:59 -05:00
parent 1dde746d19
commit 0dd735e0ec
No known key found for this signature in database
GPG Key ID: 8FC5F7D90A5D8F4D
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
help/git.md
View File

@ -45,6 +45,18 @@ Also note that `git clone` makes a remote name of `origin` by default. This is w
- Delete a branch when you're done with it: `git branch -d <branch>` - 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>` - Push your changes to a different branch (i.e. your new branch): `git push origin <branch>` **OR** `gp origin <branch>`
### Updating a Forked Repository
If you haven't already, make sure that you have added a remote to the original (upstream) repository: `git remote add upstream <dir>`
1. Fetch all the branches of that remote into `upstream/<branch>`: `git fetch upstream`
2. Change to the branch that you want to update (usually master): `git checkout master`
3. Rewrite that branch (usually master) with the changes upstream: `git rebase upstream/master`
If a lot of people have forked your reposiory, then it may be better to use `git merge upstream/master` instead. This avoids rewriting history, but at the cost of clean pull requests.
It may be necessary to force push your changes with `git push -f origin <branch>` (usually master).
## Less common commands ## Less common commands
- Removes files to commit: `git rm <files>` - Removes files to commit: `git rm <files>`