2020-03-13 17:00:12 +00:00
|
|
|
[user]
|
2017-11-03 07:09:33 +00:00
|
|
|
email = nold@gnu.one
|
2020-04-26 17:37:22 +00:00
|
|
|
name = nold
|
2020-05-20 15:24:44 +00:00
|
|
|
signingkey = DEC6FCAF59DFEEC5E762BBD1FF9A60E8F035910F
|
2020-04-26 17:37:22 +00:00
|
|
|
|
|
|
|
|
[status]
|
|
|
|
|
showUntrackedFiles = all
|
|
|
|
|
|
|
|
|
|
[alias]
|
|
|
|
|
f = fetch -v
|
|
|
|
|
l = log --all --graph --decorate=full --pretty=fuller --date-order --full-history
|
|
|
|
|
r = rebase origin/master master
|
|
|
|
|
c = commit -m
|
|
|
|
|
s = status
|
|
|
|
|
logv = log --graph --decorate=full --date-order --full-history --date=local master HEAD
|
|
|
|
|
logvr = log --graph --decorate=full --date-order --full-history --date=local master HEAD origin/master
|
|
|
|
|
logva = log --graph --decorate=full --date-order --full-history --date=local --all
|
|
|
|
|
logpf = log --patch --follow
|
|
|
|
|
dt = difftool
|
|
|
|
|
mt = mergetool
|
|
|
|
|
|
|
|
|
|
[push]
|
|
|
|
|
default = simple
|
|
|
|
|
|
|
|
|
|
[core]
|
|
|
|
|
autocrlf = input
|
|
|
|
|
|
|
|
|
|
[color]
|
|
|
|
|
ui = auto
|
|
|
|
|
|
|
|
|
|
#[color "diff"]
|
|
|
|
|
# whitespace = red reverse
|
|
|
|
|
[pull]
|
|
|
|
|
rebase = true
|
|
|
|
|
[clean]
|
|
|
|
|
requireForce = true
|
|
|
|
|
[merge]
|
|
|
|
|
tool = vimdiff3
|
|
|
|
|
conflictstyle = diff3
|
|
|
|
|
ff = only
|
|
|
|
|
#[diff]
|
|
|
|
|
# tool = vimdiff
|
|
|
|
|
[mergetool]
|
|
|
|
|
prompt = false
|
|
|
|
|
[difftool]
|
|
|
|
|
prompt = false
|
