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

Add how to undo a git rebase to help/git.md

Browse Source
This commit is contained in:
Donovan Glover 2018-03-05 23:59:01 -05:00
parent b3020e8712
commit 7175867a54
No known key found for this signature in database
GPG Key ID: 8FC5F7D90A5D8F4D
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
help/git.md
View File

@ -6,7 +6,7 @@
- Clone a git repository from an upstream url: `git clone <url>`
- Add files to commit: `git add <files>` **OR** `ga <files>`
- Commit those files to the repository: `git commit -m <message>` **OR** `gc <message>`
- Undo the last commit: `gr` **OR** `git reset HEAD~`
- Undo the last commit and keep the changes: `gr` **OR** `git reset HEAD~`
- Undo the last soft git reset: `git reset 'HEAD@{1}'`
- Undo the last commit and delete changes: `grr`
- Also known as a "hard" git reset
@ -72,6 +72,13 @@ If you need to update your local repository but have local changes, you need to
3. Next 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.
**NOTE**: To undo a git rebase, use `git reset --hard ORIG_HEAD`
To fetch a specific branch from any repository (e.g. your repository):
1. Fetch the changes into a new branch: `git fetch <remote> <name_of_remote_branch>:<name_for_the_local_branch>`
2. Checkout that branch: `git checkout <name_you_made_for_the_local_branch>`
## Less common commands
- Removes files to commit: `git rm <files>`