-
-
Save Ngofilho/a48a1f5828c707824b0f2e804b79b730 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
git config --global merge.tool vimdiff | |
git config --global merge.conflictstyle diff3 | |
git config --global mergetool.prompt false | |
git config --system merge.tool vimdiff | |
git config --system merge.conflictstyle diff3 | |
git config --system mergetool.prompt false | |
git config --global alias.l "log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit" | |
[Reference](https://www.youtube.com/watch?v=L7_iMewv5vQ) | |
Git basic commands | |
[Reference](https://illustrated-git.readthedocs.io/en/latest/) | |
Merge strategies | |
resolve recursive octopus | |
ours subtree custom? | |
[Reference](https://www.youtube.com/watch?v=sevc6668cQ0&t=565s&t=33m52s) | |
Executes at each the command | |
git rebase --exec <command> | |
[Reference](https://www.youtube.com/watch?v=sevc6668cQ0&t=565s&t=42m47s) | |
Add files to last commit (Only works if the commit wasn't pushed) | |
git commit --amend --no-edit | |
[Reference](https://www.youtube.com/watch?v=ecK3EnyGD8o&t=1m39s) | |
Dangerous command to force the push into last commit into server. | |
git push origin master --force | |
[Reference](https://www.youtube.com/watch?v=ecK3EnyGD8o&t=2m4s) | |
Rename branch name | |
git branch -M <new name> | |
[Reference](https://www.youtube.com/watch?v=ecK3EnyGD8o&t=4m6s) | |
git log --graph --oneline --decorate | |
[Reference](https://www.youtube.com/watch?v=ecK3EnyGD8o&t=4m42s) | |
husky library to use with git hooks | |
[Reference](https://www.youtube.com/watch?v=ecK3EnyGD8o&t=6m47s) | |
Returns to previous branch | |
git checkout - | |
[Reference](https://www.youtube.com/watch?v=ecK3EnyGD8o&t=7m41s) | |
Funny documentation about git | |
https://git-man-page-generator.lokaltog.net/ | |
[Reference](https://www.youtube.com/watch?v=fBP18-taaNw&t=4m25s) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment