-
Notifications
You must be signed in to change notification settings - Fork 0
/
.gitconfig
102 lines (91 loc) · 2.62 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
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
[user]
name = David Nix
email = hello@davidnix.io
signingkey = A410043BEBF42A5E
[core]
excludesfile = /Users/davidnix/.gitignore_global
[core]
pager = less -MFRSX
excludesfile = /Users/davidnix/.gitignore_global
editor = vim
# You may need to reset your tree: http://help.github.com/line-endings/
autocrlf = false
safecrlf = true
quotepath = false
[alias]
preview = fetch ; git diff HEAD...origin
sh = show --name-only --pretty="format:"
st = status
ci = commit
co = checkout
cp = cherry-pick
br = branch
di = diff
sta = stash
lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)%Creset' --abbrev-commit --date=relative
wc = whatchanged
ksreview = "!f() { local SHA=${1:-HEAD}; local BRANCH=${2:-master}; if [ $SHA == $BRANCH ]; then SHA=HEAD; fi; git difftool -y -t Kaleidoscope $BRANCH...$SHA; }; f"
# Helpers provided by http://kennethreitz.com/legit-the-sexy-git-cli.html
# switch = !legit switch \"$@\"
# branches = !legit branches
# sprout = !legit sprout \"$@\"
# unpublish = !legit unpublish \"$@\"
# harvest = !legit harvest \"$@\"
# sync = !legit sync \"$@\"
# publish = !legit publish \"$@\"
# graft = !legit graft \"$@\"
[color]
# This is not a black and white world.
branch = auto
diff = auto
interactive = auto
status = auto
ui = auto
[push]
# Only push the current branch when exec’ing “git push”
default = current
followTags = true
# Optional merge tool, http://sourcegear.com/diffmerge/ rocks.
# When you have to merge, “git mergetool”
[merge]
tool = ksdiff
[mergetool "ksdiff"]
cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
trustexitcode = true
[rerere]
# Remember merge solutions so that they are autoplayed in the future.
enabled = 1
[apply]
whitespace = nowarn
[branch]
# You should always rebase when pulling to keep the history in the correct order.
autosetuprebase = always
[diff]
# use (index, work tree, commit, object) instead of the standard a and b notation
mnemonicprefix = true
# basic rename and copy detection
tool = vimdiff
[difftool "ksdiff"]
cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
[difftool]
prompt = false
[mergetool]
prompt = false
[credential]
helper = osxkeychain
helper = /usr/local/share/gcm-core/git-credential-manager
[filter "lfs"]
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
process = git-lfs filter-process
required = true
[fetch]
prune = true
[pull]
rebase = true
[diff "sopsdiffer"]
textconv = sops -d
[init]
defaultBranch = main
[credential "https://dev.azure.com"]
useHttpPath = true