diff --git a/files/git/.gitconfig b/files/git/.gitconfig index 0195a83..bea8dfb 100644 --- a/files/git/.gitconfig +++ b/files/git/.gitconfig @@ -10,6 +10,7 @@ br = branch c = commit -v ca = commit -v --amend + cm = commit -v -m co = checkout cp = cherry-pick d = diff diff --git a/files/shell/.shellrc.alias b/files/shell/.shellrc.alias index 0675eca..7a95f6f 100644 --- a/files/shell/.shellrc.alias +++ b/files/shell/.shellrc.alias @@ -10,13 +10,12 @@ export FZF_DEFAULT_OPTS=' if [[ -d ~/.vim/plugged/fzf ]]; then [[ -x $(which fzf 2> /dev/null) ]] || export PATH=$PATH:$HOME/.vim/plugged/fzf/bin - if [[ "$SHELL" =~ "bash$" ]]; then - source ~/.vim/plugged/fzf/shell/completion.bash - source ~/.vim/plugged/fzf/shell/key-bindings.bash - fi if [[ "$SHELL" =~ "zsh$" ]]; then source ~/.vim/plugged/fzf/shell/completion.zsh source ~/.vim/plugged/fzf/shell/key-bindings.zsh + else + source ~/.vim/plugged/fzf/shell/completion.bash + source ~/.vim/plugged/fzf/shell/key-bindings.bash fi fi