jyapayne/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update files

Browse source
This commit is contained in:
Joey Yakimowich-Payne 2019-06-20 11:14:37 -06:00
commit 783636b4f7
3 changed files with 17 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
.bash_aliases
View file

@ -26,7 +26,6 @@ alias openurl="x-www-browser"
[[ $PS1 && -f /usr/share/bash-completion/bash_completion ]] && \ [[ $PS1 && -f /usr/share/bash-completion/bash_completion ]] && \
. /usr/share/bash-completion/bash_completion . /usr/share/bash-completion/bash_completion
#!/bin/bash
# Passing arguments to a function # Passing arguments to a function
gitrestore () { gitrestore () {
local file="$1" local file="$1"
@ -39,6 +38,10 @@ gitrestore () {
fi fi
} }
gitbasebranch () {
echo "$(git show-branch -a | grep '\*' | grep -v `git rev-parse --abbrev-ref HEAD` | head -n1 | sed 's/.*\[\(.*\)\].*/\1/' | sed 's/[\^~].*//')"
}
#DISPLAY=:0.0 xhost + #DISPLAY=:0.0 xhost +
source ~/bashscripts/jd.bash source ~/bashscripts/jd.bash

2
.config/nvim/init.vim
View file

@ -57,6 +57,8 @@ set laststatus=2
let g:airline_powerline_fonts = 1 let g:airline_powerline_fonts = 1
let g:airline_section_x = '' let g:airline_section_x = ''
let g:airline_section_y = '' let g:airline_section_y = ''
let g:airline_section_warning = ''
let g:airline_section_z = '%l/%L:%c'
set undofile " Save undo's after file closes set undofile " Save undo's after file closes

12
.gitconfig
View file

@ -2,8 +2,18 @@
email = jyapayne@gmail.com email = jyapayne@gmail.com
name = Joey Yakimowich-Payne name = Joey Yakimowich-Payne
[core] [core]
editor = vim editor = nvim
[color] [color]
ui = auto ui = auto
[push] [push]
default = current default = current
[alias]
basebranch = !bash -c 'git show-branch -a | grep "\\*" | grep -v $(git rev-parse --abbrev-ref HEAD) | head -n1 | sed \"s/.*\\[\\(.*\\)\\].*/\\1/\" | sed \"s/[\\^~].*//\"'
# list files which have changed since REVIEW_BASE
# (REVIEW_BASE defaults to 'master' in my zshrc)
files = !bash -c 'source $HOME/.bash_aliases && echo $(git basebranch) && git diff --name-only $(git merge-base HEAD \"$(git basebranch)\")'
# Same as above, but with a diff stat instead of just names
# (better for interactive use)
stat = !bash -c 'source $HOME/.bashrc && git diff --stat $(git merge-base HEAD \"$(git basebranch)\")'
review = !nvim -p $(git files) +\"tabdo Gdiff $(git basebranch)\" +\"let g:gitgutter_diff_base = '$(git basebranch)'\"