forked from tylerwalts/dotfiles
-
Notifications
You must be signed in to change notification settings - Fork 0
Expand file tree
/
Copy pathgitconfig
More file actions
43 lines (43 loc) · 1.41 KB
/
gitconfig
File metadata and controls
43 lines (43 loc) · 1.41 KB
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
[push]
default = simple
[alias]
dlc = diff --cached HEAD^
ci = commit
br = branch
ss = stash save
sl = stash list
sa = stash apply
st = status -s
s = status
lc = log ORIG_HEAD.. --stat
co = checkout
patch = diff --no-ext-diff
d = difftool
gl = log -10 --color=always --all --graph --topo-order --pretty='format: %Cgreen%h%Creset %s%Cred%d%Creset%n'
gll = log --color=always --all --graph --topo-order --pretty='format: %Cgreen%h%Creset %s%Cred%d%Creset%n'
lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative
lds = log --pretty=format:\"%C(yellow)%h\\ %ad%Cred%d\\ %Creset%s%Cblue\\ [%cn]\" --decorate --date=short
ls = log --pretty=format:\"%C(yellow)%h%Cred%d\\ %Credset%s%Cblue\\ [%cn]\" --decorate
lastcommit = log -1 --format=format:%h
[core]
excludesfile = ~/.gitignore_global
autocrlf = input
editor = gitvim
[difftool "SourceTree"]
cmd = opendiff \"$LOCAL\" \"$REMOTE\"
path =
tool = diffmerge
[mergetool]
cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
trustExitCode = true
keepBackup = false
diffmerge = true
[merge]
defaultToUpstream = true
tool = diffmerge
[help]
autocorrect = 1
[hub]
protocol = https
[color]
ui = true