-
Notifications
You must be signed in to change notification settings - Fork 4
/
.gitconfig
48 lines (48 loc) · 1.26 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
[user]
name = Pearl Li
email = [email protected]
[github]
user = pearlzli
[alias]
apply = apply --3way
ch = checkout
changes = diff --name-status -r
diffstat = diff --stat -r
hist = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cd) %C(bold blue)<%an>%Creset' --date=short
rm = rm --cached
tracked = ls-files
unstage = reset HEAD
[branch]
autosetuprebase = always
[color]
diff = auto
status = auto
branch = auto
interactive = auto
ui = true
pager = true
[core]
editor = emacs -nw
[diff]
tool = ediff
[difftool]
prompt = false
[difftool "ediff"]
cmd = emacs --eval \"(ediff-files \\\"$LOCAL\\\" \\\"$REMOTE\\\")\" # https://stackoverflow.com/a/42636500/2756250
[difftool "meld"]
path = /opt/homebrew/bin/meld
cmd = meld "$LOCAL" "$REMOTE"
[merge]
tool = ediff
[mergetool]
prompt = false
[mergetool "ediff"]
cmd = emacs --eval \"(ediff-merge-files \\\"$LOCAL\\\" \\\"$REMOTE\\\" nil \\\"$MERGED\\\")\" # https://stackoverflow.com/a/1817763/2756250
[mergetool "meld"]
path = /opt/homebrew/bin/meld
cmd = meld "$LOCAL" "$MERGED" "$REMOTE" --output "$MERGED"
[url "https://"]
insteadof = git://
pushInsteadOf = git://
[include]
path = ~/.gitconfig-local