-
Notifications
You must be signed in to change notification settings - Fork 7
Expand file tree
/
Copy pathgitconfig
More file actions
153 lines (152 loc) · 4.14 KB
/
gitconfig
File metadata and controls
153 lines (152 loc) · 4.14 KB
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
142
143
144
145
146
147
148
149
150
151
152
153
[advice]
detachedHead = false
[alias]
ai = add --interactive
aint = add --intent-to-add .
ap = add --patch
b = branch --verbose --verbose
cm = commit
cma = commit --amend --no-edit
cp = cherry-pick
d = diff
db = !git d "$(git config init.defaultBranch)"..
dc = diff --cached
dw = diff --word-diff
dn = diff --no-index
dt = -c diff.external=difft diff
f = fetch
files = diff-tree --no-commit-id --name-only -r
h = help
l = log --pretty=oneline-extra --date=human
last = log --max-count=1 --decorate=short --abbrev-commit --format=fuller --stat
lb = !git log --decorate=short --abbrev-commit --reverse "$(git config init.defaultBranch)"..
lg = l --graph
lgb = lg --branches
lm = !git l --first-parent "$(git config init.defaultBranch)"
; Print just the commit message
msg = show --no-patch --format=%B
mt = mergetool
pl = pull
ps = push
psfrc = push --force-with-lease --force-if-includes
pst = push --tags
r = rebase
ri = rebase --interactive
rim = !git rebase --interactive "$(git config init.defaultBranch)"
; Quickly rebase without opening the editor
riq = -c sequence.editor=: rebase --interactive
riqm = !git riq "$(git config init.defaultBranch)"
rom = !git rebase "origin/$(git config init.defaultBranch)"
ru = rebase @{u}
s = status --short --branch
sh = show
sht = -c diff.external=difft show --ext-diff
; Print just the long hash
sha = show --no-patch --format=%H
; Print just the abbreviated hash
sha-short = show --no-patch --format=%h
sm = submodule
st = stash
sw = switch
swd = switch --detach
swi = !git switch "$(git b --color | grep -v '*' | fzf --ansi | awk '{print $1}')"
swir = !git switch --detach "$(git b -r | grep -v HEAD | fzf | awk '{print $1}')"
swm = !git switch "$(git config init.defaultBranch)"
t = tag
tidy = !git branch --merged "$(git config init.defaultBranch)" | grep -Fv "$(git config init.defaultBranch)" | grep -vF '*' | grep -vF '+' | xargs git branch -d && git fetch && git remote prune origin && git branch -v | grep -F '[gone]' | grep -vF '*' | grep -vF '+' | awk '{print $1}' | xargs git branch -D
wip = !git add . && git commit --message WIP --no-verify
[branch]
autoSetupMerge = true
autoSetupRebase = always
[color]
ui = true
[commit]
gpgSign = true
verbose = true
[core]
attributesFile = ~/.gitattributes_global
excludesFile = ~/.gitignore_global
quotePath = false
trustctime = false
commentChar = ";"
pager = diff-highlight | less
[credential]
helper = osxkeychain
[credential "https://github.com"]
username = fphilipe
[diff]
algorithm = histogram
colorMoved = true
tool = vimdiff
[diff "image"]
command = git_diff_image
[difftool]
prompt = false
[fetch]
prune = true
[filter "lfs"]
smudge = git-lfs smudge -- %f
process = git-lfs filter-process
required = true
clean = git-lfs clean -- %f
[filter "media"]
clean = git-media-clean %f
smudge = git-media-smudge %f
[github]
user = fphilipe
[gui]
fontDiff = -family Menlo -size 11 -weight normal -slant roman -underline 0 -overstrike 0
[help]
autoCorrect = prompt
[init]
defaultBranch = main
templateDir = ~/.git_template
[interactive]
diffFilter = diff-highlight
singleKey = true
[merge]
conflictStyle = zdiff3
ff = no
tool = vimdiff
[mergetool]
keepBackup = false
prompt = false
[pretty]
oneline-extra = format:%C(yellow)%h%Creset%Cred%d%Creset %s %Cgreen(%cd) %C(bold blue)<%an>%Creset
[pull]
rebase = merges
[push]
default = current
autoSetupRemote = true
[rebase]
abbreviateCommands = true
autoSquash = true
autoStash = true
missingCommitsCheck = warn
updateRefs = true
[rerere]
enabled = true
[stash]
showIncludeUntracked = true
showPatch = true
showStat = true
[tag]
sort = version:refname
[url "bitbucket:"]
insteadOf = git@bitbucket.org:
[url "github.com:"]
insteadOf = git@github.com:
insteadOf = git://github.com/
insteadOf = https://github.com/
[url "git@gitlab.com:"]
insteadOf = git@gitlab.com:
insteadOf = https://gitlab.com/
[user]
email = me@phili.pe
name = Philipe Fatio
signKey = F74418A0
useConfigOnly = true
[web]
browser = open
[includeIf "gitdir/i:livemap/"]
path = .gitconfig-work