diff --git a/git/.gitconfig b/git/.gitconfig index b681e85..d8b273f 100644 --- a/git/.gitconfig +++ b/git/.gitconfig @@ -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] diff --git a/shell/.zshrc b/shell/.zshrc index 18d97ee..d23addc 100644 --- a/shell/.zshrc +++ b/shell/.zshrc @@ -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'