-
Notifications
You must be signed in to change notification settings - Fork 1
/
Copy pathconfig
104 lines (93 loc) · 2.41 KB
/
config
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
[user]
name = Put your name
email = Put Your email
[github]
user = webpro
[core]
excludesfile = ~/.config/git/ignore
editor = nano
filemode = false
trustctime = false
autocrlf = input
untrackedCache = true
pager = diff-so-fancy | less --tabs=4 -RFX
ignorecase = false
[credential]
helper = osxkeychain
[grep]
lineNumber = true
[help]
autocorrect = 1
[push]
default = simple
followTags = true
[fetch]
prune = true
[alias]
amend = commit --amend --reuse-message=HEAD
br = branch
ci = commit
co = checkout
contrib = shortlog --summary --numbered
cr = clone --recursive
df = diff --word-diff
g = grep --break --heading --line-number
l = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit
ld = "!sh -c \"git log --since '${1:-1} days ago' --oneline --author $(git config user.email)\" -"
lg = log -p
ll = log --pretty=oneline --graph --abbrev-commit
lm = log --pretty=format:'* %s (%h)'
patch = !git --no-pager diff --no-color
p = push
pf = push --force
pr = "!f() { git fetch -fu ${2:-origin} refs/pull/$1/head:pr/$1 && git checkout pr/$1; }; f"
show-ignored = "! git clean -ndX | perl -pe 's/Would remove/Ignored:/'"
st = status
stl = ls-files -m -o --exclude-standard
sts = status -sb
unstage = reset --hard HEAD
[diff]
renames = copies
indentHeuristic = true
tool = Kaleidoscope
[difftool]
prompt = false
[difftool "Kaleidoscope"]
cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
[difftool "sourcetree"]
cmd = /usr/local/bin/ksdiff -w \"$LOCAL\" \"$REMOTE\"
path =
[merge]
tool = Kaleidoscope
conflictstyle = diff3
defaultToUpstream = true
[mergetool]
prompt = false
[mergetool "Kaleidoscope"]
cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
trustExitCode = true
[mergetool "sourcetree"]
cmd = /usr/local/bin/ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
trustExitCode = true
[color]
ui = auto
[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
[color "diff-highlight"]
oldNormal = red bold
oldHighlight = red bold 52
newNormal = green bold
newHighlight = green bold 22
[pull]
rebase = true