dotfiles/gitconfig at master · aguerra/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
# gitconfig

[grep]
# Enable extended regular expressions by default
extendRegexp = true

# Enable prefixing each line of output with the 1-based line number
lineNumber = true

[alias]
# Try to use long options in all aliases for clarity
a = add
aa = add --all
b = branch
bdf = branch --delete --force
bmf = branch --move --force
c = commit
cm = commit --message
cl = clone
co = checkout
cob = checkout -b
cof = checkout --force
d = diff
g = grep
l = log
lp = log --patch --unified
p = pull
ps = push
psf = push --force
rb = rebase
rba = rebase --abort
rbc = rebase --continue
rbi = rebase --interactive
rs = reset
rsh = reset --hard
rv = revert
s = status
st = stash
stl = stash list
stp = stash pop
t = tag
una = reset HEAD
unc = reset HEAD~1

[commit]
# All commits should be GPG signed
gpgsign = true

# Put the whole diff output for reference
verbose = true

[column]
# Show in columns if the output is to the terminal
ui = auto

[branch]
# List by the most recent commit date
sort = -committerdate

[tag]
# List by the most recent creation date
sort = -creatordate

[diff]
# It can be a bit smarter than the default
algorithm = histogram

# Moved lines in a diff are colored differently
colorMoved = plain

# Replace the a/ and b/ in diff header output with where the diff is coming from
mnemonicPrefix = true

# Enable basic file rename detection
renames = true

[push]
# Add --set-upstream by default when no upstream tracking exists
autoSetupRemote = true

# Push all tags that you have locally that aren’t on the server
followTags = true

[fetch]
# Prune stuff that’s gone
prune = true
pruneTags = true

# Fetch all remotes
all = true

[help]
# Try to suggest the correct command if a typo is detected
autocorrect = prompt

[rebase]
# Enable autosquashing of fixup commits by default
autoSquash = true

# Automatically force-update branches that point to commits being rebased
updateRefs = true

[rerere]
# Records the before and after states of rebase conflicts
enabled = true

# Automatically re-apply the resolutions if it sees them again
autoupdate = true

[merge]
# Adds a ||||||| marker and the original text
conflictstyle = zdiff3

[status]
# Give the output in the short-format
short = true

# Show the branch and tracking info even in short-format
branch = true

[include]
# Local hook, put the [user] section here
path = ~/config/gitconfig