-
Notifications
You must be signed in to change notification settings - Fork 0
/
.gitconfig
81 lines (81 loc) · 2.3 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
[gc]
reflogExpire = 180 days
reflogexpireUnreachable = 90 days
[color]
diff = auto
status = auto
branch = auto
ui = auto
interactive = auto
[format]
pretty = "%Cblue%h%Creset [%cr] %s"
[user]
name = cczona
email = [email protected]
[pack]
threads = 0
[core]
excludesfile = ~/.gitignore-global
# NOTE: git already calls the environment variable $EDITOR, a reliably platform-independent method. Stick with it.
# editor = $EDITOR
quotepath = false
[alias]
bl= branch -al
br = branch -vv
bra = branch -vv -a
c = commit --cleanup=whitespace -m
ci = commit --cleanup=whitespace -m
ca = commit --cleanup=whitespace --amend
cia = commit --cleanup=whitespace --amend
co = checkout
dc = diff --cached --word-diff=color
dcl = diff --cached
di = diff --word-diff=color
dil = diff
dt = difftool
l = "log --pretty=oneline --decorate --all --tags --branches --remotes --graph --full-history --abbrev-commit"
ll = "log --pretty=short --decorate --all --tags --branches --remotes --graph --full-history --abbrev-commit --stat"
lll = "log --pretty=medium --decorate --all --tags --branches --remotes --graph --full-history --stat"
logf = "log --stat --pretty=fuller --decorate --graph"
logs = "log --oneline --decorate"
ls = ls-tree -r --name-only #NOTE needs something treeish, a commit ref like git ls HEAD or git ls master
lsr = ls-tree -r --name-only --full-tree # lists all contents of treeish, instead of those just relative to your location
mt = mergetool
pr = pull --rebase
pu = pull
re = remote -v
st = status
stasha = stash --include-untracked
stashu = stash --include-untracked
unstage = reset HEAD
[status]
color = true
[merge]
tool = opendiff
summary = true
[mergetool]
prompt = false
keepBackup = false
[mergetool]
tool = opendiff
[diff]
tool = opendiff
[difftool]
prompt = false
keepBackup = false
[difftool "diffmerge"]
cmd = diffmerge "$LOCAL" "$REMOTE"
[git-tmbundle]
gitx-path = /Applications/GitX.app
[rerere]
enabled = true
[branch]
# autosetuprebase = always # pull using rebase instead of merge
[push]
default = current
[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