Skip to content

Instantly share code, notes, and snippets.

@kaskavalci
Last active December 14, 2015 14:10
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save kaskavalci/4b4e65df679def486c32 to your computer and use it in GitHub Desktop.
Save kaskavalci/4b4e65df679def486c32 to your computer and use it in GitHub Desktop.
##
##You better change these:
##
git config --global user.name "Name Surname?"
git config --global user.email "mail@domain.com"
##
##Paste as it is
##
git config --global alias.s "status -suno"
git config --global alias.l "log --oneline --decorate"
git config --global alias.d "diff"
git config --global alias.ds "diff --stat"
git config --global alias.di "diff --stat --cached"
git config --global alias.dc "diff --name-status -M --ignore-submodules"
git config --global alias.dt "difftool"
git config --global alias.b "branch"
git config --global alias.ls "ls-files"
git config --global alias.c "commit -m"
git config --global alias.co "checkout"
git config --global alias.a "add -u"
git config --global alias.f "fetch"
git config --global alias.p "push"
git config --global alias.m "merge"
git config --global alias.mt "mergetool"
git config --global merge.conflictstyle diff3
##
## Choose your diff and merge tools
##
git config --global diff.tool kdiff3
git config --global difftool.kdiff3.path "/c/Program Files/KDiff3/kdiff3.exe"
git config --global difftool.kdiff3.keepBackup false
git config --global difftool.kdiff3.trustExitCode false
git config --global merge.tool kdiff3
git config --global mergetool.kdiff3.path "/c/Program Files/KDiff3/kdiff3.exe"
git config --global mergetool.kdiff3.keepBackup false
git config --global mergetool.kdiff3.trustExitCode false
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment