-
Notifications
You must be signed in to change notification settings - Fork 1
/
.gitconfig
66 lines (55 loc) · 1.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
[user]
name = Mike Grouchy
email = mgrouchy@gmail.com
[alias]
lo = log --oneline
lwg = log --graph --pretty=format:'%Cred%h%Creset %C(yellow)%an%d%Creset %s %Cgreen(%cr)%Creset' --date=relative
st = status
p = push
ra = remote add
rrm = remote rm
smupdate = submodule foreach git pull origin master --recurse-submodules
d = diff
ds = diff --staged
st = status
s = status
ci = commit
co = checkout
cl = clone
br = branch
last = log -1 # show the commit message of HEAD
patch = add --patch # add hunks of code interactively
rom = rebase origin/master #rebase against origin/master
# fetch from all remotes and reset to origin/master
fresh = !git fetch --all && git reset --hard origin/master -
ismerged = branch -r --merged master
[color]
diff = auto
status = auto
branch = auto
[color "branch"]
current = yellow reverse
remote = green bold
local = blue bold
[color "diff"]
meta = blue bold
frag = magenta bold
old = red bold
new = green bold
[push]
default = current
[core]
editor = vim
excludesfile = /Users/mgrouchy/.gitignore_global
[web]
browser = open
[pull]
rebase = true
[help]
autocorrect = 1
[difftool "sourcetree"]
cmd = opendiff \"$LOCAL\" \"$REMOTE\"
path =
[mergetool "sourcetree"]
cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
trustExitCode = true