-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy pathgitconfig
39 lines (39 loc) · 1.45 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
[core]
excludesfile = ~/dotfiles/gitignore
editor = mate -w
# pager = diff-highlight | diff-so-fancy | less --tabs=1,5 -R
[alias]
st = status
br = branch
co = checkout
brs = for-each-ref --sort=committerdate refs/heads/ --format='%(HEAD) %(color:yellow)%(refname:short)%(color:reset) - %(color:red)%(objectname:short)%(color:reset) - %(contents:subject) - %(authorname) (%(color:green)%(committerdate:relative)%(color:reset))'
brn = symbolic-ref --short HEAD
brc = rev-parse --abbrev-ref HEAD
lgb = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset%n' --abbrev-commit --date=relative --branches
lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%ci) %C(bold blue)<%an>%Creset' --abbrev-commit
ll = log --pretty=format:"%C(yellow)%h%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --numstat
[user]
name = Scott Hulbert
email = [email protected]
[mergetool "Kaleidoscope"]
cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
trustexitcode = true
[merge]
tool = deltawalker
[difftool "Kaleidoscope"]
cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
[difftool]
prompt = false
[mergetool]
keepBackup = false
prompt = false
[diff]
tool = Kaleidoscope
[push]
default = current
[rerere]
enabled = true
[filter "lfs"]
clean = git-lfs clean %f
smudge = git-lfs smudge %f
required = true