1
0
mirror of https://github.com/kremalicious/dotfiles.git synced 2024-11-01 07:45:33 +01:00
dotfiles/gitconfig

100 lines
2.4 KiB
Plaintext
Raw Normal View History

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]
signingkey = DD7831FC
[commit]
gpgsign = true
2015-08-01 16:23:42 +02:00
[gpg]
program = gpg2
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
quotepath = false
2014-06-16 11:01:31 +02:00
# Handle umlauts and such better on OS X
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-06-16 11:01:31 +02:00
# Make `git rebase` safer on OS X
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
[alias]
# View abbreviated SHA, description, and history graph of the latest 20 commits
2015-08-01 16:21:21 +02:00
l = log --pretty=oneline -n 20 --graph --abbrev-commit
2014-06-16 11:01:31 +02:00
ll = log --stat --abbrev-commit
# View the current working tree status using the short format
2015-08-01 16:21:21 +02:00
s = status -s
2014-06-16 11:01:31 +02:00
# Clone a repository including all submodules
c = clone --recursive
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
dm = "!git branch --merged | grep -v '\\*' | xargs -n 1 git branch -d"
2014-06-16 11:01:31 +02:00
2014-07-21 11:54:15 +02:00
[fetch]
prune = true
[push]
2015-08-01 16:21:21 +02:00
default = current
2014-07-21 11:54:15 +02:00
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
2012-06-18 01:10:31 +02:00
[color "branch"]
2015-08-01 16:21:21 +02:00
current = green bold
local = green
remote = red bold
2012-06-18 01:10:31 +02:00
[color "diff"]
2015-08-01 16:21:21 +02:00
meta = yellow bold
frag = magenta bold
old = red bold
new = green bold
2012-06-18 01:10:31 +02:00
[color "status"]
2015-08-01 16:21:21 +02:00
added = green bold
changed = yellow bold
untracked = red
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]
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"]
cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
2014-11-03 17:40:13 +01:00
trustExitCode = true
2015-08-01 16:21:21 +02:00
[ghi]
token = !security find-internet-password -a kremalicious -s github.com -l 'ghi token' -w