.gitconfig
author Oleksandr Gavenko <gavenkoa@gmail.com>
Sat, 28 Jan 2017 01:45:34 +0200
changeset 821 7bfa94a26cde
parent 764 8867e8616467
child 823 b7c18fdcc666
permissions -rw-r--r--
Swap modifiers to previous assignment because I don't want to fix them in ~/.fvwm. Assign keycode to Caps_Lock before aliasing to LCtrl so ~/.xmodmaprc script can be re-evaluated without errors.

# -*- mode: conf -*-

[user]
name = Oleksandr Gavenko
email = gavenkoa@gmail.com

[alias]
br = branch
ci = commit -a
co = checkout
cp = cherry-pick
graph = log --graph --oneline --decorate
info = config --list
pop = !git stash apply && git stash clear
sb = show-branch
st = status
staged = diff --cached
summary = log --oneline
tags = tag -n1 -l
w = whatchanged
glog = log --all --graph

[core]
whitespace=-indent-with-non-tab,trailing-space,cr-at-eol
excludesfile = ~/.gitignore

[apply]
# fix/strip/nowarn
# whitespace = strip

[color]
pager = true
ui = auto

[diff]
# Makes the diff much shorter when moving or copying files.
rename = copy

# The number of files to consider when performing the copy/rename
# detection; equivalent to the git diff option -l.
# renamelimit = 0

[merge]
conflictstyle = diff3

[log]
date = iso

[push]
# Push only current brunch.
default = simple