-
Notifications
You must be signed in to change notification settings - Fork 5
/
.gitconfig
79 lines (79 loc) · 1.69 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
[alias]
cl = clone
co = checkout
st = status -sb
f = fetch
u = pull
p = push
b = branch
t = tag
a = add -A
rm = rm -r
d = diff
ds = diff --stat
di = diff --cached
dt = difftool
dti = difftool --cached
r = rebase --preserve-merges
ri = rebase --interactive
rc = rebase --continue
ra = rebase --abort
re = remote
m = merge --ff
mn = merge --no-ff
ch = cherry-pick
l = log --oneline --decorate
lg = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)%C(bold blue)<%an>%Creset' --abbrev-commit --date=relative
ls = log --stat
lp = log -p
lm = log --merge --left-right -p
sh = show
id = describe --tags
soft = reset --soft
hard = reset --hard
undo = reset --soft HEAD^
conflicted = diff --name-only --diff-filter=U
crucible = gc --aggressive --prune=now
[core]
autocrlf = input
excludesfile = <home>/.gitignore
[color]
diff = auto
status = auto
branch = auto
interactive = auto
[log]
date = local
[diff]
tool = Kaleidoscope
[merge]
tool = Kaleidoscope
summary = true
[push]
default = current
[pull]
rebase = true
[rerere]
enabled = 1
[rebase]
autosquash = true
[credential]
helper = cache --timeout=3600
[filter "media"]
clean = git-media-clean %f
smudge = git-media-smudge %f
[difftool]
prompt = false
[mergetool]
prompt = false
[difftool "Kaleidoscope"]
cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
[mergetool "Kaleidoscope"]
cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
trustexitcode = true
[user]
name = <name>
email = <email>
[github]
user = <user>
token = <token>