A few minor updates/additions

This commit is contained in:
David Morgan 2016-04-18 14:40:11 +01:00
parent 84304cf45b
commit af37644653
3 changed files with 18 additions and 3 deletions

View File

@ -359,7 +359,11 @@ function run_cmd()
alias gitlog="git log --since=yesterday --name-only"
alias gitlog1="git log -p -1"
alias gitfp1="git format-patch --stdout -1"
alias gitdiff="git diff origin/develop"
alias gitvimdiff="git difftool --tool=vimdiff"
alias gitgvimdiff="git difftool --tool=gvimdiff"
# useful after commit, before push
alias gitdevdiff="git diff origin/develop"
alias gitmasterdiff="git diff origin/master"
alias hadd='run_cmd $(history -p ^diff^add)'
alias dogs='run_cmd docker ps; run_cmd docker logs -f $(docker ps|sed 1d|awk '"'"'{print $1;}'"'"')'

View File

@ -24,7 +24,7 @@ set sendmail="/home/djm/local/bin/msmtp"
set use_from=yes
set from="REDACTED"
set realname="REDACTED"
set realname="David Morgan"
set use_envelope_from=yes
set record="$HOME/Mail/sent" #sent mail is saved here
@ -55,7 +55,9 @@ mailboxes =debian-news
mailboxes =debian-user
mailboxes =london.pm
mailboxes =london.pm_jobs
mailboxes =pywm
mailboxes =freebsd-security
mailboxes =freebsd-python
mailboxes =freebsd-announce
mailboxes =freebsd-ports-announce
mailboxes =freebsd-current

11
.vimrc
View File

@ -106,7 +106,13 @@ if has('gui_running')
colorscheme solarized
else
set t_Co=256
colorscheme solarized
colorscheme jellybeans
"colorscheme solarized
"colorscheme inkpot
"colorscheme zenburn
"colorscheme molokai
"colorscheme badwolf
"colorscheme bubblegum-256-dark
endif
"call togglebg#map("<F9>")
@ -151,6 +157,9 @@ imap <silent> <F4> <C-o>:silent setlocal spell spelllang=en_gb<CR>
nmap <silent> <F5> :silent setlocal nospell<CR>
imap <silent> <F5> <C-o>:silent setlocal nospell<CR>
nmap <silent> <F2> :silent set diffopt+=iwhite<CR>
imap <silent> <F2> <C-o>:silent set diffopt+=iwhite<CR>
" on some systems this is not detected correcly
set background=dark