Skip to content

Instantly share code, notes, and snippets.

@metaodi
Last active October 7, 2015 12:58
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 metaodi/3168503 to your computer and use it in GitHub Desktop.
Save metaodi/3168503 to your computer and use it in GitHub Desktop.
Windows .gitconfig
[merge]
tool = beyondmerge
[mergetool "beyondmerge"]
cmd = beyondmerge.sh "$PWD/$LOCAL" "$PWD/$BASE" "$PWD/$REMOTE" "$PWD/$MERGED"
trustExitCode = false
[mergetool "kdiff3"]
path = c:/Program Files (x86)/KDiff3/kdiff3.exe
[diff]
guitool = kdiff3
[difftool "kdiff3"]
path = c:/Program Files (x86)/KDiff3/kdiff3.exe
[core]
editor = vi
autocrlf = true
[user]
name = Stefan Oderbolz
email = oderbolz@gmail.com
[alias]
co = checkout
ci = commit
st = status
br = branch
hist = log --pretty=format:\"%h %ad | %s%d [%an]\" --graph --date=short
type = cat-file -t
dump = cat-file -p
graph = log --graph --date-order -C -M --pretty=format:\"<%h> %ad [%an] %Cgreen%d%Creset %s\" --all --date=short
last = log --pretty=format:\"<%h> %ad %Cgreen%d%Creset %s [%an]\" --date-order --date=short
lg = log --decorate --pretty=oneline --abbrev-commit
lol = !git lg --graph
lola = !git lol --all
ld = !git lg ..origin/master
fu = !git fetch origin && git ld
newstash = stash -u
dc = clean -d -x -n
fc = clean -d -x -f
cleandir = !git stash -u && git stash drop
stat = log --stat
rhh = reset --hard HEAD
ls = ls-files
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment