-
Notifications
You must be signed in to change notification settings - Fork 0
/
gitconfig
55 lines (55 loc) · 1.33 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
[alias]
ap = add --patch
branches = for-each-ref --sort=-committerdate --format=\"%(color:blue)%(authordate:relative)\t%(color:red)%(authorname)\t%(color:white)%(color:bold)%(refname:short)\" refs/remotes
ci = commit -v
co = checkout
pf = push --force-with-lease
st = status
uncommit = reset --soft HEAD^
amend = commit --amend --no-edit
l = log
ll = log -n 15 | head -n 15
ri = rebase -i
rc = rebase --continue
wip = commit -m "WIP"
[blame]
date = short
[color]
ui = auto
[commit]
template = ~/.gitmessage
[core]
excludesfile = ~/.gitignore
autocrlf = input
pager = diff-so-fancy | less --tabs=4 -RFX
[diff]
colorMoved = zebra
[difftool "sourcetree"]
cmd = opendiff \"$LOCAL\" \"$REMOTE\"
path =
[fetch]
prune = true
[format]
pretty = %C(yellow)%h%Creset %C(bold cyan)%d%Creset %s %C(red)(%an, %cr)%Creset
[init]
templatedir = ~/.git_template
defaultBranch = main
[mergetool "sourcetree"]
cmd = /Applications/Sourcetree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
trustExitCode = true
[push]
default = current
autoSetupRemote = true
[rebase]
autosquash = true
[user]
name = Stephen Hanson
email = [email protected]
[pull]
rebase = false
[interactive]
diffFilter = diff-so-fancy --patch
[merge]
conflictStyle = zdiff3
[rerere]
enabled = true