mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

docs: Added some hints and tips on using git (#5537)

Browse Source
This commit is contained in:
Neil Lathwood
2017-01-21 11:48:35 +00:00
committed by GitHub
parent 294d2e83c5
commit ba7cdf4b75
1 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
doc/Developing/Using-Git.md
View File

@ -108,5 +108,26 @@ Thanks for your first pull request :)
Ok, that should get you started on the contributing path. If you have any other questions then stop by our IRC Channel
on Freenode ##librenms.
### Hints and tips
Undo last commit
`git reset --soft 'HEAD^'`
Remove specific commit
`git revert <HASH>`
Restore deleted file
`git checkout $(git rev-list -n 1 HEAD -- "$file")^ -- "$file"`
Merge last two commits
`git rebase --interactive HEAD~2`
In the text file that opens, change the last commit to squash from pick then save an exit.
For more tips take a look at [Oh shit, git!](http://ohshitgit.com/)
[1]: http://gitready.com
[2]: http://git-scm.com/book