-
Notifications
You must be signed in to change notification settings - Fork 1
/
gitconfig
98 lines (78 loc) · 2.32 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
########################################################################
# Le Git Config
########################################################################
# Values coming from environment variables set in private file
# [user]
# email =
# name =
[user]
name = Matthias Kretschmann
email = m@kretschmann.io
signingKey = BD3C1F3EDD7831FC
[commit]
gpgSign = true
[github]
user = kremalicious
[credential]
helper = osxkeychain
[core]
excludesfile = ~/.gitignore
quotepath = false
# Handle umlauts and such better on macOS
# for whatever crazy reason this explicitly
# has to be set to false so tracked files with
# special characters don't get treated as untracked
precomposeunicode = false
# Make `git rebase` safer on macOS
# More info: http://www.git-tower.com/blog/make-git-rebase-safe-on-osx/
trustctime = false
# Be case sensitive on case insensitive systems
ignorecase = false
[alias]
c = clone --recursive
co = checkout
l = log --oneline --decorate -15
lo = log --oneline --decorate
s = status -s
# Amend the currently staged files to the latest commit
amend = commit --amend --reuse-message=HEAD
# Remove branches that have already been merged with master
# a.k.a. ‘delete merged’
dm = "!git branch --merged main | grep -v '\\* main' | xargs -n 1 git branch -d"
dma = "!git branch --merged master | grep -v '\\* master' | xargs -n 1 git branch -d"
uncommit = reset --soft HEAD^
unstage = reset HEAD
yolo = push --force
[fetch]
prune = true
[pull]
rebase = false
[init]
defaultBranch = main
[status]
showUntrackedFiles = all
[color]
diff = auto
status = auto
branch = auto
interactive = auto
ui = auto
# Set Kaleidoscope as diff and merge tool
[diff]
tool = Kaleidoscope
[difftool]
prompt = false
[difftool "Kaleidoscope"]
cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
[merge]
tool = Kaleidoscope
[mergetool]
prompt = false
[mergetool "Kaleidoscope"]
cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
trustExitCode = true
[filter "lfs"]
required = true
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
process = git-lfs filter-process