doccheckin shouldn't do anything if git is waiting on the user to merge

1 files changed, 9 insertions, 1 deletions

diff --git a/bin/doccheckin b/bin/doccheckin
index 6d3825d4..089de561 100755
--- a/bin/doccheckin
+++ b/bin/doccheckin
@@ -1,6 +1,14 @@
-#!/bin/sh
+#!/bin/zsh
 
 cd ~/doc/
+
+# don't do anything if waiting on a manual merge; don't want just
+# blanket commit that merge
+gstatus=$(git status)
+if [[ $gstatus =~ 'You have unmerged paths.' ]]; then
+    exit
+fi
+
 git add org/*.org playlists/*.m3u emacs-abbrevs emacs-bookmarks mutt-aliases mutt-groups
 
 # this command should never fail and stop mr