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]
|
[user]
|
||||||
name = Andrew Tomaka
|
name = Andrew Tomaka
|
||||||
email = atomaka@gmail.com
|
email = atomaka@gmail.com
|
||||||
|
signingkey = 582BAC86
|
||||||
[github]
|
[github]
|
||||||
user = atomaka
|
user = atomaka
|
||||||
|
|
||||||
[apply]
|
[apply]
|
||||||
whitespace = fix
|
whitespace = fix
|
||||||
[alias]
|
[alias]
|
||||||
hist = log --graph --pretty=format:'%Cred%h%Creset - %s %Cgreen(%cr)%Creset' --abbrev-commit --date=relative
|
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
|
hist-details = log --pretty=format:"%C(yellow)%h%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --numstat
|
||||||
|
@ -15,24 +16,24 @@
|
||||||
[color]
|
[color]
|
||||||
ui = auto
|
ui = auto
|
||||||
[color "branch"]
|
[color "branch"]
|
||||||
current = yellow reverse
|
current = yellow reverse
|
||||||
local = yellow
|
local = yellow
|
||||||
remote = green
|
remote = green
|
||||||
[color "diff"]
|
[color "diff"]
|
||||||
meta = yellow bold
|
meta = yellow bold
|
||||||
frag = magenta
|
frag = magenta
|
||||||
old = red
|
old = red
|
||||||
new = green
|
new = green
|
||||||
[color "status"]
|
[color "status"]
|
||||||
added = yellow
|
added = yellow
|
||||||
changed = green
|
changed = green
|
||||||
untracked = cyan
|
untracked = cyan
|
||||||
[core]
|
[core]
|
||||||
excludesfile = ~/.gitignore_global
|
excludesfile = ~/.gitignore_global
|
||||||
autocrlf = input
|
autocrlf = input
|
||||||
editor = vim
|
editor = vim
|
||||||
filemode = false
|
filemode = false
|
||||||
[merge]
|
[merge]
|
||||||
tool = vimdiff
|
tool = vimdiff
|
||||||
[push]
|
[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_PATH" ]] && PATH="$GNU_TOOLS_PATH:$PATH"
|
||||||
[[ -d "$GNU_TOOLS_MAN_PATH" ]] && MANPATH="$GNU_TOOLS_MAN_PATH:$MANPATH"
|
[[ -d "$GNU_TOOLS_MAN_PATH" ]] && MANPATH="$GNU_TOOLS_MAN_PATH:$MANPATH"
|
||||||
|
|
||||||
|
GPG_TTY=$(tty)
|
||||||
|
export GPG_TTY
|
||||||
|
|
||||||
# clean up duplicate paths
|
# clean up duplicate paths
|
||||||
typeset -U PATH
|
typeset -U PATH
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue