Skip to content

Instantly share code, notes, and snippets.

@mapfel
Last active December 11, 2020 13:27
Show Gist options
  • Save mapfel/2017098 to your computer and use it in GitHub Desktop.
Save mapfel/2017098 to your computer and use it in GitHub Desktop.
Git configurations
[core]
autocrlf = True
# whitespace = fix,-indent-with-non-tab,trailing-space,cr-at-eol
excludesfile = ~/.gitignore
# https://help.github.com/en/articles/associating-text-editors-with-git
editor = 'C:/Program Files/Notepad++/notepad++.exe' -multiInst -notabbar -nosession -noPlugin
[color]
ui = auto
[color "branch"]
current = yellow reverse
local = yellow
remote = green
[color "diff"]
meta = yellow bold
frag = magenta bold
old = red bold
new = green bold
whitespace = red reverse
[color "status"]
added = green
changed = red
untracked = cyan
[user]
name = Marko Apfel
email = ...(at)...de
[alias]
ci = commit
st = status -u
co = checkout
oneline = log --pretty=oneline
br = branch
la = log --pretty=\"format:%ad %h (%an): %s\" --date=short
df = diff
dc = diff --cached
lg = log -p
lol = log --graph --decorate --pretty=oneline --abbrev-commit
lola = log --graph --decorate --pretty=oneline --abbrev-commit --all
ls = ls-files
ign = ls-files -o -i --exclude-standard
l = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %Cblue<%an>%Creset' --abbrev-commit --date=relative --all
# http://blog.bfitz.us/?p=1811
assume = update-index --assume-unchanged
unassume = update-index --no-assume-unchanged
assumed = "!git ls-files -v | grep ^h | cut -c 3-"
[push]
default = simple
[http]
sslverify = false
version = HTTP/1.1
[merge]
# tool = p4merge
tool = kdiff3
# tool = araxis
[mergetool "kdiff3"]
path = C:/_apps/Applications/kdiff3/kdiff3.exe
[mergetool "p4merge"]
path = C:/_apps/Applications/p4merge/p4merge.exe
cmd = p4merge \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"
keepTemporaries = false
trustExitCode = false
keepBackup = false
[mergetool "araxis"]
path = C:/Program Files/Araxis/Araxis Merge/compare.exe
[diff]
# tool = p4merge
tool = kdiff3
# tools = vscode
guitool = kdiff3
[difftool "kdiff3"]
path = C:/_apps/Applications/kdiff/kdiff3.exe
[difftool "p4merge"]
path = C:/_apps/Applications/p4merge/p4merge.exe
cmd = \"p4merge.exe $LOCAL $REMOTE\"
[difftool "vscode"]
cmd = code --wait --diff $LOCAL $REMOTE
[credential]
helper = wincred
# helper = !\"C:\\Program Files\\GitExtensions\\GitCredentialWinStore\\git-credential-winstore.exe\"
# Can ignore specific files
.DS_Store
# Use wildcards as well
#*~
# Can also ignore all directories and files in a directory.
#tmp/**/*
# http://geekswithblogs.net/mapfel/archive/2012/10/05/150907.aspx
/bin/
#obj/
obj/Debug
obj/Release
*.suo
*.user
_ReSharper.*
*.resharper
NDependOut
*.FxCopReport.xml
StyleCop.Cache
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment