2012-06-18 01:10:31 +02:00
|
|
|
|
########################################################################
|
|
|
|
|
# Le Git Config
|
|
|
|
|
########################################################################
|
|
|
|
|
|
2014-11-03 17:40:13 +01:00
|
|
|
|
# Values coming from environment variables set in private file
|
|
|
|
|
# [user]
|
|
|
|
|
# email =
|
|
|
|
|
# name =
|
|
|
|
|
|
2015-08-01 16:26:41 +02:00
|
|
|
|
[user]
|
2016-10-14 21:59:34 +02:00
|
|
|
|
name = Matthias Kretschmann
|
|
|
|
|
email = m@kretschmann.io
|
2017-05-19 15:54:49 +02:00
|
|
|
|
signingKey = DD7831FC
|
2015-08-01 16:26:41 +02:00
|
|
|
|
|
|
|
|
|
[commit]
|
2017-05-19 15:54:49 +02:00
|
|
|
|
gpgSign = true
|
2015-08-01 16:26:41 +02:00
|
|
|
|
|
2012-06-18 01:10:31 +02:00
|
|
|
|
[github]
|
2015-08-01 16:21:21 +02:00
|
|
|
|
user = kremalicious
|
2014-11-03 17:40:13 +01:00
|
|
|
|
|
2012-06-18 01:10:31 +02:00
|
|
|
|
[credential]
|
2015-08-01 16:21:21 +02:00
|
|
|
|
helper = osxkeychain
|
2014-06-16 11:01:31 +02:00
|
|
|
|
|
2012-06-18 01:10:31 +02:00
|
|
|
|
[core]
|
2015-08-01 16:21:21 +02:00
|
|
|
|
excludesfile = ~/.gitignore
|
2016-10-14 21:59:34 +02:00
|
|
|
|
quotepath = false
|
2014-06-16 11:01:31 +02:00
|
|
|
|
|
2019-06-08 02:42:18 +02:00
|
|
|
|
# Handle umlauts and such better on macOS
|
2014-07-11 14:43:32 +02:00
|
|
|
|
# for whatever crazy reason this explicitly
|
|
|
|
|
# has to be set to false so tracked files with
|
|
|
|
|
# special characters don't get treated as untracked
|
2015-08-01 16:21:21 +02:00
|
|
|
|
precomposeunicode = false
|
2014-07-11 14:11:36 +02:00
|
|
|
|
|
2019-06-08 02:42:18 +02:00
|
|
|
|
# Make `git rebase` safer on macOS
|
2015-08-01 16:21:21 +02:00
|
|
|
|
# More info: http://www.git-tower.com/blog/make-git-rebase-safe-on-osx/
|
|
|
|
|
trustctime = false
|
2014-06-16 11:01:31 +02:00
|
|
|
|
|
2019-06-08 02:42:18 +02:00
|
|
|
|
# Be case sensitive on case insensitive systems
|
|
|
|
|
ignorecase = false
|
|
|
|
|
|
2014-06-16 11:01:31 +02:00
|
|
|
|
[alias]
|
2016-10-14 21:59:34 +02:00
|
|
|
|
c = clone --recursive
|
|
|
|
|
co = checkout
|
|
|
|
|
l = log --oneline --decorate -15
|
|
|
|
|
lo = log --oneline --decorate
|
|
|
|
|
s = status -s
|
2014-06-16 11:01:31 +02:00
|
|
|
|
|
2015-08-01 16:21:21 +02:00
|
|
|
|
# Amend the currently staged files to the latest commit
|
|
|
|
|
amend = commit --amend --reuse-message=HEAD
|
2014-06-16 11:01:31 +02:00
|
|
|
|
|
|
|
|
|
# Remove branches that have already been merged with master
|
2015-08-01 16:21:21 +02:00
|
|
|
|
# a.k.a. ‘delete merged’
|
2020-11-02 23:31:41 +01:00
|
|
|
|
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"
|
|
|
|
|
|
2016-10-14 21:59:34 +02:00
|
|
|
|
uncommit = reset --soft HEAD^
|
|
|
|
|
unstage = reset HEAD
|
|
|
|
|
yolo = push --force
|
2014-06-16 11:01:31 +02:00
|
|
|
|
|
2014-07-21 11:54:15 +02:00
|
|
|
|
[fetch]
|
|
|
|
|
prune = true
|
|
|
|
|
|
2017-05-19 15:55:20 +02:00
|
|
|
|
[status]
|
|
|
|
|
showUntrackedFiles = all
|
|
|
|
|
|
2012-06-18 01:10:31 +02:00
|
|
|
|
[color]
|
2015-08-01 16:21:21 +02:00
|
|
|
|
diff = auto
|
|
|
|
|
status = auto
|
|
|
|
|
branch = auto
|
|
|
|
|
interactive = auto
|
|
|
|
|
ui = auto
|
2014-06-16 11:01:31 +02:00
|
|
|
|
|
2014-07-21 11:54:15 +02:00
|
|
|
|
# Set Kaleidoscope as diff and merge tool
|
2013-06-20 18:26:10 +02:00
|
|
|
|
[diff]
|
2014-06-16 11:01:31 +02:00
|
|
|
|
tool = Kaleidoscope
|
2013-06-25 13:28:47 +02:00
|
|
|
|
[difftool]
|
2014-06-16 11:01:31 +02:00
|
|
|
|
prompt = false
|
2014-07-21 11:54:15 +02:00
|
|
|
|
[difftool "Kaleidoscope"]
|
|
|
|
|
cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
|
|
|
|
|
[merge]
|
2018-11-25 17:38:26 +01:00
|
|
|
|
tool = Kaleidoscope
|
2013-06-25 13:28:47 +02:00
|
|
|
|
[mergetool]
|
2014-06-16 11:01:31 +02:00
|
|
|
|
prompt = false
|
2014-07-21 11:54:15 +02:00
|
|
|
|
[mergetool "Kaleidoscope"]
|
2018-11-25 17:38:26 +01:00
|
|
|
|
cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
|
2014-11-03 17:40:13 +01:00
|
|
|
|
trustExitCode = true
|
2018-11-25 17:38:26 +01:00
|
|
|
|
[filter "lfs"]
|
|
|
|
|
required = true
|
|
|
|
|
clean = git-lfs clean -- %f
|
|
|
|
|
smudge = git-lfs smudge -- %f
|
|
|
|
|
process = git-lfs filter-process
|
2020-11-02 23:31:41 +01:00
|
|
|
|
[pull]
|
|
|
|
|
rebase = false
|
|
|
|
|
[gpg]
|
|
|
|
|
program = /usr/local/bin/gpg
|