Merge branch 'master' of git.hjp.at:hjp/dot
This commit is contained in:
commit
29aaf5ab91
|
@ -15,3 +15,10 @@
|
||||||
# nothing is inconvenient, matching is dangerous.
|
# nothing is inconvenient, matching is dangerous.
|
||||||
# current is only compatible remaining option.
|
# current is only compatible remaining option.
|
||||||
default = current
|
default = current
|
||||||
|
[color "diff"]
|
||||||
|
# Display commit ids blue on white.
|
||||||
|
# Default is yellow on normal which is unreadable with a light
|
||||||
|
# background
|
||||||
|
commit = blue white
|
||||||
|
[pull]
|
||||||
|
rebase = false
|
||||||
|
|
5
.zshenv
5
.zshenv
|
@ -251,6 +251,9 @@ if [ -d /etc/profile.d ]
|
||||||
then
|
then
|
||||||
for i in /etc/profile.d/*.sh
|
for i in /etc/profile.d/*.sh
|
||||||
do
|
do
|
||||||
. $i
|
if [ -r $i ]
|
||||||
|
then
|
||||||
|
. $i
|
||||||
|
fi
|
||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
|
|
1
.zshrc
1
.zshrc
|
@ -6,7 +6,6 @@ REPORTTIME=2
|
||||||
alias amke=make
|
alias amke=make
|
||||||
alias a=alias
|
alias a=alias
|
||||||
alias h=history
|
alias h=history
|
||||||
alias j=jobs
|
|
||||||
alias v=vi
|
alias v=vi
|
||||||
alias lo=logout
|
alias lo=logout
|
||||||
alias md=mkdir
|
alias md=mkdir
|
||||||
|
|
|
@ -0,0 +1 @@
|
||||||
|
ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIN4jRA8UfI8UNzbxFq1xnRxm1oKzs39pDpB7ox5gBXvC hjp@arche-noah
|
Loading…
Reference in New Issue