dotfiles/gitconfig at master · dvincelli/dotfiles · GitHub

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
[color]
status = auto
branch = auto
interactive = auto
diff = auto

[alias]
co = checkout
st = status
ci = commit
br = branch
df = diff
lg = log -p
lol = log --graph --decorate --pretty=oneline --abbrev-commit
lola = log --graph --decorate --pretty=oneline --abbrev-commit --all
ls = ls-files

[core]
excludesfile = ~/.gitignore
autocrlf = input

;[git-tmbundle]
;gitx-path = gitx
;
;[mergetool "diffmerge"]
;cmd = diffmerge --merge --result=$MERGED $LOCAL $BASE $REMOTE
;trustExitCode = false
;
;[merge]
;tool = diffmerge

[color]
status = auto
branch = auto
interactive = auto
diff = auto

[alias]
co = checkout
st = status
ci = commit
br = branch
df = diff
lg = log -p
lol = log --graph --branches --decorate --pretty=oneline --graph
lola = log --graph --decorate --pretty=oneline --abbrev-commit --all
ls = ls-files
lrt = branch --sort=-committerdate
amend = commit -a --amend --no-edit
a = commit -a --amend --no-edit
l = lol
dead = branch --merged main^
current = branch --show-current
w = show-branch --current
shove = push --force-with-lease --force-if-includes
s = shove
d = diff
spop = stash pop
spush = stash push
p = pull
f = fetch
hist = log --pretty=format:'%h %ad | %s%d [%an]' --graph --date=short
# pick most recently used branches in fzf
mru = "!f() { \
        branch=$(git for-each-ref --sort=-committerdate refs/heads/ --format='%(refname:short)' | \
        fzf --height 40% --reverse --border --prompt=\"Branch: \" \
        --preview='git log -p {} | head -100'); \
        [ -n \"$branch\" ] && git checkout \"$branch\"; \
    }; f"
last = !git log -5 --oneline
search = "!f() { git log -S \"$1\"; }; f"
# Open the current repository's remote URL in a browser (macOS/Linux)
open = "!f() { \
        url=$(git remote get-url origin | sed -E 's|^git@([^:]+):|https://\\1/|; s|\\.git$||'); \
        open \"$url\"; \
    }; f"

[blame]
coloring = repeatedLines
markUnblamables = true
markIgnoredlines = true

[branch]
sort = -committerdate

[checkout]
defaultRemote = origin

[color]
branch = auto
diff = auto
status = auto

[column]
ui = auto

[diff]
mnemonicPrefix = true
wsErrorHighlight = all
colorMoved = dimmed-zebra
wordDiff = color
algorithm = minimal

[fetch]
prune = true
pruneTags = true
output = compact
parallel = 0

[grep]
extendedRegexp = true

[help]
autoCorrect = 1

[init]
defaultBranch = main

[merge]
conflictStyle = diff3

[push]
default = current
followTags = true
autoSetupRemote = true

[pull]
default = current

[showBranch]
default = HEAD
default = main

[status]
relativePaths = false
short = true
branch = true

[rerere]
enabled = true
autoUpdate = true