# -*- mode: conf -*-

[alias]
br = branch
ci = commit
co = checkout
cp = cherry-pick
graph = log --graph --oneline --decorate
info = config --list
sb = show-branch
st = status
staged = diff --cached
summary = log --oneline
tags = tag -n1 -l
w = whatchanged
glog = log --graph --exclude=refs/heads/*.stgit --exclude=refs/patches/* --exclude=refs/stash --all

[core]
whitespace=-indent-with-non-tab,trailing-space,cr-at-eol
excludesfile = ~/.gitignore
autocrlf = input
safecrlf = warn
eol = lf
filemode = false

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

[color]
pager = true
ui = auto

[diff]
context = 5
# Makes the diff much shorter when moving or copying files.
renames = 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
follow = true

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

[pull]
ff = only

[rerere]
# Reuse Recorded Resolution. Keeps database of manually resolved conflicts.
enabled = true

# [user] section is in .gitconfig.extra