-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy pathgitconfig
117 lines (107 loc) · 2.95 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
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
[alias]
c = commit
up = pull
p = push
upo = pull origin
rup = pull --rebase
rupo = pull --rebase origin
co = checkout
por = push origin
b = branch
br = branch -a
s = status -s
su = status -u
db = branch -D
stc = stash
st = stash list
sta = stash apply
std = stash drop
upodg = pull dg
rudg = pull --rebase dg
pordg = push dg
plrm = pull-request
r = revert
m = merge
#TAGS
lsrt = ls-remote --tags origin
ptg = push --tags
rmlt = tag -d
dev = checkout develop
phk= push heroku
df = diff --color --color-words --abbrev
lg = log --graph --all --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)%Creset' --abbrev-commit --date=relative
lg2 = log --graph --all --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative
lol = log --pretty=oneline --abbrev-commit --graph --decorate --all
lod = log --oneline --decorate
lp = log -p
lf = log --graph
#l1 = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --
#l2 = log --graph --all --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative
#lf = log --pretty=fuller
ignorechanges = update-index --assume-unchanged
noticechanges = update-index --no-assume-unchanged
gc-ap = gc --aggressive --prune
listconf = config --global --list
cam = commit -a -m
cmn = commit -m -n
lsm = log -M --stat
hse = log --stat -5
diffall = diff HEAD
logr = log -M
logr2 = log --stat -M -2
logit = log --stat -M
scrub = !git reset --hard && git clean -fd
rh = reset --hard
cfd = !git clean -fd
pub = push -u origin
rv = remote -v
ra = remote add
lwr = log --stat -C
pur = pull --rebase
whatis = show -s --pretty='tformat:%h (%s, %ad)' --date=short
rbi = rebase -i
[color]
ui = true
[core]
excludesfile = /Users/crac/.gitignore_global
attributesfile = ~/.gitattributes
pager = diff-so-fancy | less --tabs=4 -RFX
[color "branch"]
current = yellow reverse
local = yellow
remote = green
[color "diff-highlight"]
oldNormal = red bold
oldHighlight = red bold 52
newNormal = green bold
newHighlight = green bold 22
[color "diff"]
meta = 227
frag = magenta bold
commit = 227 bold
old = red bold
new = green bold
whitespace = red reverse
# meta = yellow bold
# frag = magenta bold
# old = red bold
# new = green bold
[color "status"]
added = yellow
changed = green
untracked = cyan
[merge]
log = true
[user]
name = cracdev
email = [email protected]
[mergetool]
keepBackup = false
[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
[init]
defaultBranch = main