forked from paulirish/dotfiles
-
Notifications
You must be signed in to change notification settings - Fork 5
/
.gitconfig
85 lines (84 loc) · 2.12 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
[alias]
c = commit
aa = add .
tool = mergetool
up = fetch --all --prune
p = push
m = merge
st = status -s
a = add -i
d = diff --color --color-words --abbrev
dc = diff --color --color-words --abbrev --cached
l = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --
rt = reset HEAD --hard
am = commit --amend
rollback = reset HEAD~10 --hard
ch = checkout
b = branch
find = rev-list -n 1 HEAD
sub = submodule
patch = format-patch -1
r = reset
[color]
ui = always
[core]
excludesfile = ~/.gitignore
attributesfile = ~/.gitattributes
editor = 'nvim'
# windows withespace (you don't need this for unix
# @see https://stackoverflow.com/questions/1889559/git-diff-to-ignore-m
# @see https://stackoverflow.com/questions/5834014/lf-will-be-replaced-by-crlf-in-git-what-is-that-and-is-it-important
# whitespace = cr-at-eol
autocrlf = input
[color "branch"]
; current = yellow reverse
; local = yellow
; remote = green
[color "diff"]
; meta = yellow bold
; frag = magenta bold
; old = red bold
; new = green bold
[color "status"]
; added = yellow
; changed = green
; untracked = cyan
[merge]
log = true
tool = nvimdiff
[difftool]
prompt = true
[diff]
tool = nvimdiff
[difftool "nvimdiff"]
cmd = "nvim -d \"$LOCAL\" \"$REMOTE\""
[url "[email protected]:"]
insteadOf = "gh:"
pushInsteadOf = "github:"
pushInsteadOf = "git://github.com/"
[url "git://github.com/"]
insteadOf = "github:"
[url "[email protected]:"]
insteadOf = "gst:"
pushInsteadOf = "gist:"
pushInsteadOf = "git://gist.github.com/"
[url "git://gist.github.com/"]
insteadOf = "gist:"
# Any GitHub repo with my username should be checked out r/w by default
# http://rentzsch.tumblr.com/post/564806957/public-but-hackable-git-submodules
[url "[email protected]:richistron/"]
insteadOf = "git://github.com/richistron/"
[user]
name = Ricardo Rivas
email = [email protected]
[push]
default = current
[pull]
default = current
rebase = false
[gc]
auto = 0
[branch]
autoSetupMerge = always
[init]
defaultBranch = main