forked from thoughtbot/dotfiles
-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy pathgitconfig
56 lines (56 loc) · 1.48 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
[alias]
aa = add --all
ap = add --patch
bd = branch --delete
bdf = branch --delete --force
br = branch --move
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 --signoff
co = checkout
fat = fetch --all --tags --prune
glog = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset'
ls = branch --list
pf = push --force-with-lease
sa = stash save --include-untracked
st = status
undo = reset --soft HEAD^
[color]
ui = auto
[commit]
gpgsign = true
[core]
excludesfile = ~/.gitignore_global
[diff]
tool = Kaleidoscope
[difftool]
prompt = false
[difftool "Kaleidoscope"]
cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
[include]
path = ~/.gitconfig.local
[init]
templatedir = ~/.git_template
[merge]
conflictstyle = diff3
ff = only
keepBackup = false
tool = Kaleidoscope
[mergetool]
prompt = false
[mergetool "Kaleidoscope"]
cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
trustExitCode = true
[push]
default = simple
followTags = true
[rebase]
autosquash = true
[status]
showUntrackedFiles = all
[transfer]
fsckobjects = true
[filter "lfs"]
smudge = git-lfs smudge -- %f
process = git-lfs filter-process
required = true
clean = git-lfs clean -- %f