Created
October 11, 2012 14:13
-
-
Save skalinets/3872601 to your computer and use it in GitHub Desktop.
Git aliases
This file contains hidden or 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
[alias] | |
prep = !git clean -ffd && git submodule foreach 'git reset --hard && git clean -ffd && git fetch --all' && git submodule update --init | |
lg = log --graph --date-order --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative | |
pr = pull --rebase | |
[difftool "kdiff3"] | |
path = C:/Program Files/KDiff3/kdiff3.exe | |
trustExitCode = false | |
[difftool] | |
prompt = false | |
[diff] | |
tool = kdiff3 | |
[mergetool "kdiff3"] | |
path = C:/Program Files/KDiff3/kdiff3.exe | |
trustExitCode = false | |
[mergetool] | |
keepBackup = false | |
[merge] | |
tool = kdiff3 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment