extern/nix-config
1
0
Fork 1
mirror of https://github.com/donovanglover/nix-config.git synced 2025-01-25 23:28:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add git stash information to help/git.md

Browse Source
This commit is contained in:
Donovan Glover 2018-01-11 19:47:08 -05:00
parent cc4ca3bc2c
commit 621b1b03eb
No known key found for this signature in database
GPG Key ID: 8FC5F7D90A5D8F4D
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
help/git.md
View File

@ -62,6 +62,13 @@ It may be necessary to force push your changes with `git push -f origin <branch>
Note that you should always make changes from an external branch then make a pull request from your external branch to avoid rewriting history. Note that you should always make changes from an external branch then make a pull request from your external branch to avoid rewriting history.
If you need to update your local repository but have local changes, you need to stash them first.
1. Fetch upstream like usual.
2. Use `git stash` to store your changes temporarily.
3. Rebase the branch you want to update with `upstream/<branch>` (usually master).
4. Finally use `git stash pop` to update your repository with the stashed changes.
## Less common commands ## Less common commands
- Removes files to commit: `git rm <files>` - Removes files to commit: `git rm <files>`