[READ-ONLY] Mirror of https://github.com/plttn/dotfiles.
Add .config/git/config Update .config/tmux/tmux.conf
Jack Platten
(Feb 23, 2024, 10:30 PM -0800)
c347c5c6
bb27eb7a
+151
+145
private_dot_config/git/config.tmpl
+145
private_dot_config/git/config.tmpl
···
1
+
[init]
2
+
defaultBranch = main
3
+
[include]
4
+
path = /Users/jack/.gitconfig.d/themes.gitconfig
5
+
[user]
6
+
email = "{{ .email }}"
7
+
name = "{{ .name }}"
8
+
signingkey = "{{ .signingkey }}"
9
+
10
+
[alias]
11
+
# one-line log
12
+
l = log --pretty=format:"%C(yellow)%h\\ %ad%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --date=short
13
+
ll = log --pretty=format:"%C(yellow)%h%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --numstat
14
+
lds = log --pretty=format:"%C(yellow)%h\\ %ad%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --date=short
15
+
ld = log --pretty=format:"%C(yellow)%h\\ %ad%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --date=relative
16
+
le = log --oneline --decorate
17
+
18
+
lg = lg1
19
+
lg1 = lg1-specific --all
20
+
lg2 = lg2-specific --all
21
+
lg3 = lg3-specific --all
22
+
23
+
lg1-specific = log --graph --abbrev-commit --decorate --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(auto)%d%C(reset)'
24
+
lg2-specific = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold cyan)%aD%C(reset) %C(bold green)(%ar)%C(reset)%C(auto)%d%C(reset)%n'' %C(white)%s%C(reset) %C(dim white)- %an%C(reset)'
25
+
lg3-specific = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold cyan)%aD%C(reset) %C(bold green)(%ar)%C(reset) %C(bold cyan)(committed: %cD)%C(reset) %C(auto)%d%C(reset)%n'' %C(white)%s%C(reset)%n'' %C(dim white)- %an <%ae> %C(reset) %C(dim white)(committer: %cn <%ce>)%C(reset)'
26
+
27
+
28
+
a = add
29
+
ap = add -p
30
+
c = commit --verbose
31
+
ca = commit -a --verbose
32
+
cm = commit -m
33
+
cam = commit -a -m
34
+
m = commit --amend --verbose
35
+
36
+
d = diff
37
+
ds = diff --stat
38
+
dc = diff --cached
39
+
40
+
s = status -s
41
+
co = checkout
42
+
cob = checkout -b
43
+
# list branches sorted by last modified
44
+
b = "!git for-each-ref --sort='-authordate' --format='%(authordate)%09%(objectname:short)%09%(refname)' refs/heads | sed -e 's-refs/heads/--'"
45
+
46
+
# difftool aliases
47
+
# difftastic
48
+
49
+
dcom = "!f() { GIT_EXTERNAL_DIFF=difft git show HEAD --ext-diff; }; f";
50
+
dlog = "!f() { GIT_EXTERNAL_DIFF=difft git log -p --ext-diff; }; f";
51
+
dfft = "difftool -t difftastic";
52
+
53
+
54
+
# kaleidoscope
55
+
kcom = "!f() { GIT_EXTERNAL_DIFF=ksdiff git show HEAD --ext-diff; }; f";
56
+
klog = "!f() { GIT_EXTERNAL_DIFF=ksdiff git log -p --ext-diff; }; f";
57
+
dffk = "difftool -t kale";
58
+
59
+
dl = "!git ll -1"
60
+
dlc = diff --cached HEAD^
61
+
62
+
63
+
64
+
# list aliases
65
+
la = "!git config -l | grep alias | cut -c 7-"
66
+
67
+
[filter "lfs"]
68
+
clean = git-lfs clean -- %f
69
+
smudge = git-lfs smudge -- %f
70
+
process = git-lfs filter-process
71
+
required = true
72
+
[core]
73
+
editor = code --wait
74
+
pager = delta
75
+
excludesfile = /Users/jack/.config/git/ignore
76
+
77
+
[interactive]
78
+
diffFilter = delta --color-only
79
+
80
+
81
+
[interactive]
82
+
diffFilter = delta --color-only
83
+
84
+
[delta]
85
+
navigate = true # use n and N to move between diff sections
86
+
light = false # set to true if you're in a terminal w/ a light background color (e.g. the default macOS terminal)
87
+
88
+
[merge]
89
+
conflictstyle = diff3
90
+
91
+
[diff]
92
+
colorMoved = default
93
+
94
+
95
+
96
+
[gpg "ssh"]
97
+
allowedSignersFile = /Users/jack/.ssh/allowed_signers
98
+
99
+
100
+
#program = /Applications/1Password.app/Contents/MacOS/op-ssh-sign
101
+
102
+
103
+
[fetch]
104
+
prune = true
105
+
106
+
[gpg]
107
+
format = ssh
108
+
109
+
[push]
110
+
autoSetupRemote = true
111
+
followTags = true
112
+
113
+
114
+
[includeIf "hasconfig:remote.*.url:https://github.com/**"]
115
+
path = /Users/jack/.gitconfig.d/github.conf
116
+
[includeIf "hasconfig:remote.*.url:git@github.com:*/**"]
117
+
path = /Users/jack/.gitconfig.d/github.conf
118
+
[includeIf "hasconfig:remote.*.url:ssh://git@github.com:*/**"]
119
+
path = /Users/jack/.gitconfig.d/github.conf
120
+
[includeIf "hasconfig:remote.*.url:ssh://git@gitlab.com:*/**"]
121
+
path = /Users/jack/.gitconfig.d/gitlab.conf
122
+
[includeIf "hasconfig:remote.*.url:https://gitlab.com/**"]
123
+
path = /Users/jack/.gitconfig.d/gitlab.conf
124
+
[includeIf "hasconfig:remote.*.url:git@gitlab.com:*/**"]
125
+
path = /Users/jack/.gitconfig.d/gitlab.conf
126
+
127
+
[difftool "difftastic"]
128
+
cmd = difft "$LOCAL" "$REMOTE"
129
+
130
+
[pager]
131
+
difftool = true
132
+
[difftool "kale"]
133
+
cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
134
+
[mergetool "kale"]
135
+
cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
136
+
trustExitCode = true
137
+
[difftool]
138
+
prompt = false
139
+
trustExitCode = true
140
+
[gpg]
141
+
program = /opt/homebrew/bin/gpg
142
+
[commit]
143
+
gpgsign = true
144
+
[pull]
145
+
rebase = false