-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy path.gitconfig
69 lines (68 loc) · 1.79 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
[alias]
c = commit -am
up = pull
p = push
s = status -s
df = diff --color --color-words --abbrev
lg = log --oneline --decorate --graph
st = status
ci = commit
unstage = reset HEAD --
co = checkout
fco = fuzzy-checkout
[color]
ui = true
[core]
excludesfile = /Users/adam/.gitignore_global
attributesfile = ~/.gitattributes
pager = `brew --prefix git`/share/git-core/contrib/diff-highlight/diff-highlight | less #Only with homebrew git, obvi
editor = /usr/bin/vim
[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
conflictstyle = "diff3"
[url "[email protected]:"]
insteadOf = "gh:"
pushInsteadOf = "github:"
pushInsteadOf = "git://github.com/"
insteadOf = https://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]:BigBlue79/"]
insteadOf = "git://github.com/BigBlue79/"
[user]
email = [email protected]
name = Adam Jasiura
[push]
default = simple
autoSetupRemote = true
[difftool "sourcetree"]
cmd = opendiff \"$LOCAL\" \"$REMOTE\"
path =
[mergetool "sourcetree"]
cmd = /opt/homebrew-cask/Caskroom/sourcetree/2.1/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
trustExitCode = true
[init]
defaultBranch = main
[branch]
sort = -committerdate