diff --git a/.config/git/config b/.config/git/config
index 4d96cce..8358dcd 100644
--- a/.config/git/config
+++ b/.config/git/config
@@ -123,7 +123,7 @@
 	# COMMIT SHORTHANDS
 	cme = commit -v --edit --message
 	# yadm
-	cgit    = !yadm cme "config/git:"   -- $XDG_CONFIG_HOME/git/config $CONFIG_SHELLS/git $HOME/.local/bin/git-*
+	cgit    = !yadm cme "config/git:"   -- $XDG_CONFIG_HOME/git $CONFIG_SHELLS/git $HOME/.local/bin/git-*
 	cvim    = !yadm cme "config/nvim:"  -- $XDG_CONFIG_HOME/nvim/init*
 	cshell  = !yadm cme "config/shell:" -- $CONFIG_SHELLS
 	cbin    = !yadm cme "bin:"          -- $HOME/.local/bin
diff --git a/.config/git/ignore b/.config/git/ignore
index d7a0a8c..554b906 100755
--- a/.config/git/ignore
+++ b/.config/git/ignore
@@ -8,6 +8,7 @@
 .idea/caches
 .idea/markdown-*
 .idea/compiler.xml
+.idea/kotlinc.xml
 .idea/misc.xml
 .idea/modules.xml
 .idea/encodings.xml
diff --git a/.config/shell/git b/.config/shell/git
index c79d4a2..5829dad 100644
--- a/.config/shell/git
+++ b/.config/shell/git
@@ -135,8 +135,8 @@ git-withdate() {
 gitedit() {
   git stash
   gitcommits -q $1
-  git reset --hard $1
-  git stash pop -q
+  git reset --keep $1
+  git stash pop
   git-withdate $1 commit --all --amend "${@:2}"
   gitcommits
 }
diff --git a/.local/bin/git-ready b/.local/bin/git-ready
index 785141b..a15b702 100755
--- a/.local/bin/git-ready
+++ b/.local/bin/git-ready
@@ -1,5 +1,5 @@
 #!/bin/sh
 # Interactive rebase onto the remote
 remote="$1"
-shift
+test $# -gt 0 && shift
 git rebase -i ${remote:-'@{push}'} "$@"