Skip to content

Instantly share code, notes, and snippets.

@irq0
Created May 4, 2014 14:30
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 irq0/30e0b23660491466de0b to your computer and use it in GitHub Desktop.
Save irq0/30e0b23660491466de0b to your computer and use it in GitHub Desktop.
*.xml diff=xml
*.png diff=exif
*.xml2 diff=xml
[color]
ui = true
diff = auto
status = auto
branch = auto
interactive = auto
[user]
name = Marcel Lauhoff
email = ml@irq0.org
[apply]
whitespace = fix
[core]
excludesfile = ~/.gitignore
whitespace = trailing-space,space-before-tab
attributesfile = ~/.gitattributes
editor = emacsclient -nw -c
[alias]
w =! PAGER=cat && echo "Branches:" && git branch -a && echo "Last commits:" && git log --branches --oneline --graph --decorate --simplify-by-decoration --since='2 months ago'
s = status -sb
d = diff
dw = diff --color-words
last = !git log --graph --pretty='format:%C(24)%h%C(red)%d%Creset %s %C(white) (%C(green)%an, %ar%Creset)' | head
b = branch -v
c = commit
ca = commit -a
t = tag -n
p = push
cnt = shortlog -ns
undo = reset --soft HEAD^
amend = commit --amend -C HEAD
l = log --graph --pretty='format:%C(24)%h%C(red)%d%Creset %s %C(white) (%C(green)%an, %ar%Creset)'
ll = log --graph --date=short --format='%C(94)--------------------------------------------------------------------------------%n%C(24)%h %C(124)%ad (%ar) %C(34)%an %C(22)<%ae>%C(130)%d%n%C(178)%s%+b'
a = add
[diff]
# Git diff will use (i)ndex, (w)ork tree, (c)ommit and (o)bject
# instead of a/b/c/d as prefixes for patches
mnemonicprefix = true
[diff "xml"]
textconv = xml2 <
[color "branch"]
current = yellow reverse
local = yellow
remote = green
[color "diff"]
meta = magenta
[diff "exif"]
textconv = exiftool
[rerere]
enabled = 1
[help]
autocorrect = 1
[tig]
show-rev-graph = true
show-refs = yes
author-width = 10
show-id = yes
[tig "color"]
default = 245 233
id = 24 233
date = 88 233
main-head = red 233
main-remote = red 233
main-tracked = red 233
main-commit = red 233
main-ref = red 233
graph-commit = yellow 233
cursor = yellow red bold
author = 74 233
title-focus = green black
title-blur = green black
status = green black
commit = 24 233
pp-author = 74 233
pp-commit = 74 233
pp-merge = red 233
pp-date = 88 233
pp-adate = 88 233
pp-cdate = 88 233
pp-refs = red 233
diff-stat = 245 233
diff-index = 233 233
[push]
default = simple
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment