forked from puppetlabs/puppetlabs-rcfiles
-
Notifications
You must be signed in to change notification settings - Fork 3
Expand file tree
/
Copy pathgitconfig
More file actions
146 lines (119 loc) · 2.68 KB
/
gitconfig
File metadata and controls
146 lines (119 loc) · 2.68 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
# some options taken from here: https://blog.gitbutler.com/how-git-core-devs-configure-git/
[alias]
a = add
aa = add -A
ap = add -p
b = branch
ba = branch -a
bd = branch -D
bm = branch --merged
bmv = branch -v --merged
bv = branch -avv
c = commit
ca = commit -a
cam = commit -a -m
cm = commit -m
co = checkout
cp = cherry-pick
d = diff
dc = diff --cached
dcw = diff --cached -w
dn = diff --numstat
ds = diff --staged
dst = diff --stat
dt = difftool
dtc = difftool --cached
dw = diff -w
fa = fetch --all
l = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%C(reset) %s %C(green)(%cr) %C(bold blue)<%an>%C(reset)' --abbrev-commit --date=relative
l1 = log --pretty=oneline
lg = log -p
ld = log --pretty=format:'%C(red)%H%C(reset) %C(yellow)%ai%C(reset) %C(blue)%<(25)%an%C(reset) %C(green)%d%C(reset) %s' --date=short
lu = log --graph --pretty=format:'%C(red)%h%C(reset) -%C(yellow)%d%C(reset) %s %C(green)(%cr) %C(bold blue)<%an>%C(reset)' --abbrev-commit --date=relative -u
luw = log --graph --pretty=format:'%C(red)%h%C(reset) -%C(yellow)%d%C(reset) %s %C(green)(%cr) %C(bold blue)<%an>%C(reset)' --abbrev-commit --date=relative -u -w
m = commit -m
mt = mergetool
p = push
pa = push --all
pt = push --tags
rv = remote -v
s = status
tree = log --oneline --decorate --graph
undo-commit = reset --soft HEAD^
[branch]
sort = -committerdate
[column]
ui = auto
[commit]
verbose = true
[core]
autocrlf = input
editor = vim
excludesfile = ~/.gitignore_global
# fsmonitor = true
# untrackedCache = true
[color]
diff = auto
ui = auto
[color "diff"]
whitespace = red reverse
[credential]
helper = cache
[diff]
algorithm = histogram
colorMoved = plain
mnemonicPrefix = true
renames = true
tool = vimdiff
[difftool]
prompt = false
[fetch]
all = true
prune = true
pruneTags = true
[filter "lfs"]
clean = git-lfs clean %f
required = true
smudge = git-lfs smudge %f
[filter "media"]
clean = git media clean %f
required = true
smudge = git media smudge %f
[gitflow "prefix"]
feature = feature/
hotfix = hotfix/
release = release/
support = support/
versiontag = v
[gpg]
program = gpg2
[help]
autocorrect = prompt
[hub]
protocol = ssh
[include]
path = ~/.gitconfig.local
[init]
defaultBranch = main
[merge]
# (just 'diff3' if git version < 2.3)
# conflictstyle = zdiff3
conflictstyle = diff3
tool = vimdiff
[mergetool]
keepbackup = true
[pull]
rebase = false
[push]
autoSetupRemote = true
default = simple
followTags = true
[rebase]
autoSquash = true
autoStash = true
updateRefs = true
[rerere]
autoupdate = true
enabled = true
[tag]
sort = version:refname