Skip to content

Instantly share code, notes, and snippets.

@chussenot chussenot/.gitconfig
Last active May 22, 2019

Embed
What would you like to do?
[user]
email = chussenot@xxx.com
name = Clement Hussenot
[core]
whitespace = fix,-indent-with-non-tab,trailing-space,cr-at-eol
editor = nvim -f
autocrlf = false
safecrlf = true
excludesfile = ~/.gitignore
pager = diff-so-fancy | less --tabs=4 -RFX
[pull]
rebase = true
[push]
config = default
default = simple
[merge]
summary = true
ff = only
# http://www.rosipov.com/blog/use-vimdiff-as-git-mergetool/#fromHistor
# https://stackoverflow.com/questions/161813/how-to-resolve-merge-conflicts-in-git
tool = vimdiff
conflictstyle = diff3
prompt = true
[fetch]
prune = true
[color]
ui = true
[color "branch"]
current = yellow reverse
local = yellow
remote = green
[color "diff"]
meta = 227
frag = magenta bold
old = red bold
new = green bold
commit = 227 bold
whitespace = red reverse
[color "status"]
added = yellow
changed = green
untracked = blue
[alias]
a = add -u
aa = add --all :/
ap = add -u -p
b = browse
c = commit -v
co = checkout
d = diff
ds = diff --staged
dw = diff --color-words
po = push origin head
pr = "!f() { git fetch origin refs/pull/$1/head:pr/$1 && git co pr/$1; } ; f"
s = status -s -b
sm = submodule
smu = submodule foreach git pull origin master
td = merge --no-ff
up = "!git fetch upstream && git rebase upstream/master"
w = whatchanged --decorate
wp = whatchanged --decorate -p
tree = log --oneline --decorate --all --graph l = log --pretty='format:%C(yellow)%h %C(blue)%ad %C(reset)%s%C(red)%d %C(green)%an%C(reset), %C(cyan)%ar' --date=short
[color "diff-highlight"]
oldNormal = red bold
oldHighlight = red bold 52
newNormal = green bold
newHighlight = green bold 22
[http]
sslVerify = false
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.