-
Notifications
You must be signed in to change notification settings - Fork 2
/
Copy pathgitconfig
78 lines (77 loc) · 1.83 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
[user]
name = Alex May
email = [email protected]
[color]
diff = auto
status = auto
branch = auto
interactive = auto
ui = always
[alias]
ci = commit
amend = commit --amend
co = checkout
bra = branch -a
cp = cherry-pick
m = merge --no-ff --no-commit
f = fetch --prune --all
puo = push -u origin HEAD
d = diff
dc = diff --cached
a = add
ap = add -p
aa = add --all
head = !git l -1
h = !git head
l = log --graph --abbrev-commit --date=relative
la = !git l --all
poh = push origin HEAD
puoh = push -u origin HEAD
b = branch
rho = !git stash -u 2>&1 > /dev/null && git reset --hard origin/`bash -c current_branch`
cleanup = !git branch --merged | grep -v '\\bmaster$\\|\\bmain$' | xargs git branch -d
[format]
pretty=format:%C(yellow)%h%Creset -%C(red)%d%Creset %s %Cgreen(%ar) %C(bold blue)<%an>%Creset
[merge]
summary = false
tool = p4merge
conflictstyle = diff3
[mergetool]
keepBackup = false
keepTemporaries = false
prompt = false
[mergetool "mvim3"]
keepBackup = false
keepTemporaries = false
cmd=/usr/local/bin/mvim -v -f -d -c \"wincmd J\" \"$MERGED\" \"$LOCAL\" \"$BASE\" \"$REMOTE\"
[mergetool "p4merge"]
keepTemporaries = false
keepBackup = false
[diff]
tool = vimdiff
compactionHeuristic = true
[difftool]
prompt = false
[rerere]
enabled = true
[push]
default = tracking
[core]
excludesfile = ~/.gitignore_global
autocrlf = input
filemode = true
ignorecase = false
trustctime = 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]
templatedir = ~/.git_template
defaultBranch = main
[browser "ff"]
cmd = open -a Firefox.app
[web]
browser = ff