forked from brandonweiss/dotfiles
-
Notifications
You must be signed in to change notification settings - Fork 0
/
gitconfig
100 lines (82 loc) · 2.14 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
[user]
name = Brandon Weiss
email = brandon@anti-pattern.com
[github]
user = brandonweiss
[core]
excludesfile = ~/.gitignore
autocrlf = input
ignorecase = false
pager = "diff-so-fancy | less --tabs=4 -RFX"
[diff]
# For Github-style word diffs
wordRegex = [^[:space:]]
tool = Kaleidoscope
compaction-heuristic = true
[difftool]
prompt = false
[difftool "Kaleidoscope"]
cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
[merge]
tool = Kaleidoscope
[mergetool]
prompt = false
[mergetool "Kaleidoscope"]
cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" \"$REMOTE\"
[color]
ui = auto
diff = auto
interactive = auto
status = auto
branch = auto
[color "diff-highlight"]
oldNormal = "red bold"
oldHighlight = "red bold 52"
newNormal = "green bold"
newHighlight = "green bold 22"
[push]
default = current
[fetch]
prune = true
[rebase]
autosquash = true
[remote "origin"]
# fetch = +refs/pull/*/head:refs/remotes/origin/pull/*
[alias]
# ra = recent commits, all reachable refs
# r = recent commits, only current branch
# la = all commits, all reachable refs
# l = all commits, only current branch
s = status -sb
f = fetch
ra = !git r --all
r = !GIT_NO_PAGER=1 git l -30
la = !git l --all
l = "!. ~/.githelpers && pretty_git_log"
d = diff
dc = diff --cached
co = checkout
com = checkout master
cob = checkout -b
b = branch
c = commit -m
ca = commit -a -m
cp = commit -am 'cp'
amen = amend --no-edit
w = whatchanged
sl = shortlog -s -n
up = "!git fetch && git rebase origin/master"
bc = "!f() { git branch --merged ${1-master} | grep -v " ${1-master}$" | xargs git branch -d; }; f"
bd = "!f() { git checkout ${1-master} && git up && git bc ${1-master}; }; f"
[filter "media"]
required = true
clean = git media clean %f
smudge = git media smudge %f
[filter "hawser"]
clean = git hawser clean %f
smudge = git hawser smudge %f
required = true
[filter "lfs"]
clean = git lfs clean %f
smudge = git lfs smudge %f
required = true