forked from joshukraine/dotfiles
-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy pathgitconfig
121 lines (97 loc) · 2.47 KB
/
gitconfig
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
# https://git-scm.com/docs/git-config
[alias]
a = add
aa = add --all
ap = add --patch
b = branch
ba = branch --all
br = branch --remote
ca = commit --amend
cm = commit -v
cl = clone
co = checkout
com = checkout master
df = diff
dc = diff --cached
f = fetch
l = log --date=format:'%b %d, %Y' --pretty=format:'%C(yellow bold)%h%Creset%C(white)%d%Creset %s%n%C(blue)%aN <%ae> | %cd%n'
lg = log --graph --stat --date=format:'%b %d, %Y' --pretty=format:'%C(yellow bold)%h%Creset%C(white)%d%Creset %s%n%C(blue)%aN <%ae> | %cd%n'
pl = pull
ps = push
psf = push --force-with-lease
pum = push -u origin master
recent = for-each-ref --sort=committerdate refs/heads/ --format='%(HEAD) %(color:yellow)%(refname:short)%(color:reset) - %(color:red)%(objectname:short)%(color:reset) - %(contents:subject) - %(authorname) (%(color:green)%(committerdate:relative)%(color:reset))'
rv = remote -v
s = status
tl = tag --list
re = reset
rsh = reset --soft HEAD^
wch = whatchanged -p --abbrev-commit --pretty=medium -10
[apply]
whitespace = nowarn
[color]
ui = true
[color "branch"]
current = white bold
local = yellow
remote = cyan
[color "diff"]
frag = cyan bold
meta = white
new = green bold
old = red bold
commit = yellow bold
whitespace = red reverse
[color "diff-highlight"]
oldNormal = red bold
oldHighlight = red bold 52
newNormal = green bold
newHighlight = green bold 22
[color "status"]
untracked = cyan
[commit]
template = ~/.gitmessage
[core]
autocrlf = input
excludesfile = ~/.gitignore_global
ignorecase = false
safecrlf = warn
abbrev = 7
editor = nvim
[diff]
tool = vimdiff3
submodule = log
[pager]
diff = diff-so-fancy | less --tabs=4 -RFXS
log = less -+X
[fetch]
prune = true
[gitsh]
defaultCommand = status --short --branch
[gitsh "color"]
default = blue
modified = red
untracked = cyan
[include]
path = ~/.gitconfig.local
[init]
defaultBranch = master
[mailmap]
# Display commit author names based on global mailmap file.
file = ~/.mailmap
[merge]
conflictstyle = diff3
# Always create local merge commits when merging.
ff = false
[pull]
# Don't flatten locally created merge commits when rebasing.
rebase = merges
[push]
# Refuse to push if upstream branch name is different from local.
default = simple
[status]
submoduleSummary = true
[url "https://github.com/"]
insteadOf = git@github.com:
[url "https://"]
insteadOf = git://