blob: 8a95fabaeebe0aa63d918156f9930c18af5bf1ce (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
|
[user]
email = bluewind@xinu.at
name = Florian Pritz
signingkey = 0x4CE1C13E
[alias]
co = checkout
s = status
l = log --pretty=format:'%C(yellow)%h %Cred%ad %Cblue%an%Cgreen%d %Creset%s' --date=short --decorate=short
m = commit -vs
ap = add -pi
cp = cherry-pick
dic = diff --cached --stat -p
d = diff --stat -p
am = am -s
c = cherry -v
b = branch -vv
sup = log --all --pretty=format:'%Cblue%h%C(yellow)%d %Creset%s %Cgreen(%cr) %Cred%an%+b'
sp = show --stat -p
mff = merge --ff-only
refl = reflog --date=relative
mnf = merge --no-ff
ours = "!f() { git checkout --ours $@ && git add $@; }; f"
theirs = "!f() { git checkout --theirs $@ && git add $@; }; f"
[merge]
tool = vimdiff
conflictstyle = diff3
[push]
default = current
[color]
ui = true
[sendemail]
smtpserver = /usr/bin/msmtp
envelopesender = bluewind@xinu.at
chainreplyto = false
suppresscc = self
#cccmd = git-cc
[mergetool "cp"]
cmd = cp \"$REMOTE\" \"$MERGED\"
[mergetool "vim"]
cmd = vim -f \"$MERGED\"
[mergetool "vimdiff3"]
cmd = vim -f -d -c \"wincmd J\" \"$MERGED\" \"$LOCAL\" \"$BASE\" \"$REMOTE\"
[mergetool "splice"]
cmd = "vim -f $BASE $LOCAL $REMOTE $MERGED -c 'SpliceInit'"
trustExitCode = true
[core]
excludesfile = ~/.gitignore
compression = 9
attributesfile = ~/git/dotfiles/.gitattributes
[log]
decorate = full
[gc]
autopacklimit = 20
|
