-
Notifications
You must be signed in to change notification settings - Fork 2
/
Copy path.gitconfig
141 lines (141 loc) · 4.09 KB
/
.gitconfig
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
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
[user]
name = Camden Narzt
email = [email protected]
signingkey = 45CDAC6F53A7A2EE3D294A79E349304DE45D816B
[blame]
coloring = highlightRecent
[core]
autocrlf = input
compression = 9
editor = emacs
# excludesfile default is: ~/.config/git/ignore
excludesfile = ~/Developer/Bash/dot-files/.gitignore
fsyncMethod = writeout-only
looseCompression = 9
# pager = delta --dark --theme TwoDark
whitespace = trailing-space,space-before-tab
# fsmonitor = true # really slow, wtf?
# fsync = none
# filemode = false
hooksPath = ~/Developer/Bash/dot-files/.git/hooks
# sshCommand = ssh -vvvv
[pack]
compression = 9
[interactive]
# diffFilter = delta --color-only
[delta]
features = side-by-side line-numbers decorations navigate
hyperlinks = false
whitespace-error-style = 22 reverse
[delta "decorations"]
commit-decoration-style = bold yellow box ul
file-style = bold yellow ul
file-decoration-style = none
[sendemail]
# smtpencryption = tls
# smtpserver = smtp.gmail.com
# smtpuser = [email protected]
# smtpserverport = 587
[color]
ui = auto
blame = highlightRecent
[color "branch"]
current = yellow bold
local = green bold
remote = cyan bold
[color "diff"]
meta = yellow bold
frag = magenta bold
old = red bold
new = green bold
whitespace = red reverse
[color "status"]
added = green bold
changed = yellow bold
untracked = red bold
[apply]
whitespace = fix
[alias]
root = rev-parse --show-toplevel
amend = commit --amend
ammend = commit --amend
contains = describe --contains
history = log --oneline --abbrev-commit --all --graph --decorate --color
lg = log --graph --abbrev-commit --decorate --date=relative --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(bold yellow)%d%C(reset)' --all
dlog = "-c diff.external=difft log -p --ext-diff"
idiff = difftool -t idiff -y
diffw = diff --ignore-space-change
git = "!exec git"
ignore = "!git status | grep \"$@\" | tr -d '[:space:]' >> .gitignore #"
submodules = submodule
commitw = "!git diff -U0 -w --no-color | git apply --cached --ignore-whitespace --unidiff-zero -"
unstage = restore --staged
upto = "!git push $(git rev-parse --abbrev-ref --symbolic @{u} | cut -d/ -f1) \"$*\":$(git config --get \"branch.$(git branch --show-current).merge\") #"
zip = archive --format=zip --output=archive.zip -9 HEAD
tar = archive --format=tar --output=archive.tar HEAD
sub = submodule update --init --recursive
swap = switch -
files-in-commit = diff-tree --no-commit-id --name-only -r
track = "!git log -L$1,$2:$3 || echo 'usage: git track startLine endLine file' #"
trackf = "!git log -L:$1:$2 || echo 'usage: git trackf function file' #"
[push]
default = simple
# When pushing to a branch without remote, automatically --set-upstream.
autoSetupRemote = true
[filter "lfs"]
# clean = git-lfs clean -- %f
# smudge = git-lfs smudge -- %f
# required = true
# process = git-lfs filter-process
[gpg]
program = /usr/local/bin/gpg
# if broken try to replace with script containing: exec gpg --no-tty "$@"
[commit]
gpgsign = true
template = ~/.config/git/commitMsg
[url "[email protected]:"]
insteadOf = https://gitlab.phusion.nl/
[url "[email protected]:"]
insteadOf = https://github.com/
insteadOf = gh:
[diff]
renames = copies
indentHeuristic = true
compactionHeuristic = true
algorithm = histogram
colorMoved = default
colorMovedWS = ignore-all-space
tool = difftastic
external = difft
[merge]
tool = vimdiff
conflictstyle = diff3
# ff = false
[difftool]
prompt = false
[difftool "vim"]
cmd = vimdiff $LOCAL $REMOTE
[difftool "idiff"]
cmd = diff -iwu $LOCAL $REMOTE | less
[difftool "difftastic"]
cmd = difft "$LOCAL" "$REMOTE"
[init]
defaultBranch = main
[credential]
helper = osxkeychain
[pull]
rebase = true
[fetch]
# Remove references to remote branches that have been deleted.
prune = true
[submodule]
recurse = true
[trace2]
# perfTarget = ~/Desktop/gitlog.perf
# normalTarget = ~/Desktop/gitlog.normal
# eventTarget = ~/Desktop/gitlog.event
[pager]
difftool = true
[rerere]
# Automatically record and reuse conflict resolutions.
enabled = true