Updates for GPG
This commit is contained in:
parent
28b3162317
commit
23557cf409
2 changed files with 24 additions and 20 deletions
41
gitconfig
41
gitconfig
|
@ -1,11 +1,12 @@
|
|||
[user]
|
||||
name = Andrew Tomaka
|
||||
email = atomaka@gmail.com
|
||||
name = Andrew Tomaka
|
||||
email = atomaka@gmail.com
|
||||
signingkey = 582BAC86
|
||||
[github]
|
||||
user = atomaka
|
||||
user = atomaka
|
||||
|
||||
[apply]
|
||||
whitespace = fix
|
||||
whitespace = fix
|
||||
[alias]
|
||||
hist = log --graph --pretty=format:'%Cred%h%Creset - %s %Cgreen(%cr)%Creset' --abbrev-commit --date=relative
|
||||
hist-details = log --pretty=format:"%C(yellow)%h%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --numstat
|
||||
|
@ -15,24 +16,24 @@
|
|||
[color]
|
||||
ui = auto
|
||||
[color "branch"]
|
||||
current = yellow reverse
|
||||
local = yellow
|
||||
remote = green
|
||||
current = yellow reverse
|
||||
local = yellow
|
||||
remote = green
|
||||
[color "diff"]
|
||||
meta = yellow bold
|
||||
frag = magenta
|
||||
old = red
|
||||
new = green
|
||||
meta = yellow bold
|
||||
frag = magenta
|
||||
old = red
|
||||
new = green
|
||||
[color "status"]
|
||||
added = yellow
|
||||
changed = green
|
||||
untracked = cyan
|
||||
added = yellow
|
||||
changed = green
|
||||
untracked = cyan
|
||||
[core]
|
||||
excludesfile = ~/.gitignore_global
|
||||
autocrlf = input
|
||||
editor = vim
|
||||
filemode = false
|
||||
excludesfile = ~/.gitignore_global
|
||||
autocrlf = input
|
||||
editor = vim
|
||||
filemode = false
|
||||
[merge]
|
||||
tool = vimdiff
|
||||
tool = vimdiff
|
||||
[push]
|
||||
default = upstream
|
||||
default = upstream
|
||||
|
|
3
zshrc
3
zshrc
|
@ -1,6 +1,9 @@
|
|||
[[ -d "$GNU_TOOLS_PATH" ]] && PATH="$GNU_TOOLS_PATH:$PATH"
|
||||
[[ -d "$GNU_TOOLS_MAN_PATH" ]] && MANPATH="$GNU_TOOLS_MAN_PATH:$MANPATH"
|
||||
|
||||
GPG_TTY=$(tty)
|
||||
export GPG_TTY
|
||||
|
||||
# clean up duplicate paths
|
||||
typeset -U PATH
|
||||
|
||||
|
|
Loading…
Reference in a new issue