Various updates

gitconfig

@@ -9,7 +9,8 @@
 	b = branch
 	bn = rev-parse --abbrev-ref HEAD
 	br = branch
-	ca = commit --amend
+	ca = commit --amend --no-edit
+	cae = commit --amend
 	cdf = clean -df
 	cdfn = clean -dfn
 	cf = !git commit --fixup $(git log --invert-grep --grep fixup -n1 --oneline --format=format:%h)
@@ -48,7 +49,7 @@
 	re = rebase
 	rh = reset --hard
 	rom = !sh -c 'git fetch && git rebase origin/master'
-	rr = !git reset --hard $(git rb)
+	rr = !sh -c 'git fetch && git reset --hard $(git rb)'
 	s = status
 	shp = show -p
 	sl = stash list

nvimrc

@@ -215,6 +215,7 @@ _G.run_tests = function()
 
   vim.api.nvim_command([[silent up]])
 
+  -- TODO: check that it is not the current window, if the window has a non-term buffer
   local winid = _G._test_cmd_to_wins[cmd]
   if winid == nil or not vim.api.nvim_win_is_valid(winid) or not vim.call("win_gotoid", winid) == -1 then
     vim.api.nvim_command([[10split]])

script/cleanvimplugins

@@ -12,7 +12,7 @@ pluginhome=$HOME/.vim/pack/git-plugins
 cd $pluginhome/opt
 find . -mindepth 1 -maxdepth 1 -type d -print0 | while read -d $'\0' pluginpath
 do
-  if ! grep -q "$pluginpath" $HOME/.vimrc ; then
+  if ! grep -q "$pluginpath" $HOME/.config/nvim/init.vim ; then
     basename=$(basename $pluginpath)
     echo "rm -rf $pluginhome/opt/$basename"
   fi

zshrc

@@ -77,7 +77,7 @@ alias gp="git push"
 alias gst="git status"
 alias gt="go test"
 alias gta="go test ./..."
-alias ji="jira"
+alias ji="jira -b"
 alias k9="kill -9"
 alias ll="exa -l --group-directories-first --git"
 alias ls="exa --color=auto"