stonewareslord/sync
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'stow' of gaw:stonewareslord/sync into stow

Browse Source
This commit is contained in:
Austen Adler 2019-04-05 14:29:42 -04:00
commit 854ecc91cb
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
git/.gitconfig
View File

@ -15,7 +15,7 @@
st = status
br = branch -av
hist = log --all --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%ci) %C(bold blue)<%an>%Creset' --abbrev-commit
d = difftool
dt = difftool
cbranch = !sh -c 'git commit -m \"$2\"&&git branch $1&&git reset --hard HEAD~1&&git co \"$1\"' -
nbranch = !sh -c 'git branch $1&&git reset --hard HEAD~1&&git co \"$1\"' -
size = "!git diff --cached --binary | wc -c | numfmt --to=iec-i"
@ -26,6 +26,8 @@
noignore = update-index --no-assume-unchanged
rename-branch = branch -m
find-file = "!for branch in $(git for-each-ref --format=\"%(refname)\" refs/heads); do if git ls-tree -r --name-only $branch | grep \"$1\" > /dev/null; then echo \"${branch}:\"; git ls-tree -r --name-only $branch | nl -bn -w3 | grep \"$1\"; fi; done; :"
# n => no pager
ndiff = !git --no-pager diff
[push]
default = matching
[core]

2
shell/.zshrc
View File

@ -98,7 +98,7 @@ ex eix && alias eix="eix -F"
ex tmux && alias tmux='tmux -2'
ex tree && alias tree='tree -C'
ex ocp && alias ocp="ocp -vs0 -dcurses"
alias jupyter='docker run --rm --user="$(id -u):$(id -g)" -v "$PWD":/home/jovyan/work -p 8888:8888 ymatsunaga/octave'
alias jupyter='docker run --rm --user="$(id -u):$(id -g)" -v "$PWD":/home/jovyan/work -p 8888:8888 ymatsunaga/octave jupyter notebook --ip 0.0.0.0'
alias con='git x php bin/console'
alias disphost='export DISPLAY=:0.0'
alias l='ls -CF'