Merge remote-tracking branch 'origin/dev' into dev

3 files changed, 3 insertions, 3 deletions

diff --git a/mutt/default b/mutt/default
index 5b43aff..d30c299 100644
--- a/mutt/default
+++ b/mutt/default
@@ -145,7 +145,7 @@ color tilde         white           black
 color message       cyan            black
 color markers       red             black
 color attachment    brightred       black
-color search        brightblack     white
+color search        black           red
 color status        brightwhite     black
 color indicator     white           blue
 color tree          magenta         black   # arrows in threads
diff --git a/tools/git/check-repos.sh b/tools/git/check-repos.sh
index e6f3b6c..5180fc9 100755
--- a/tools/git/check-repos.sh
+++ b/tools/git/check-repos.sh
@@ -28,7 +28,7 @@ while read repo remote; do
   changes="$(git -c color.status=always status --short)"
 
   # Diff between from local repo and remote
-  cherry="$(git cherry)"
+  cherry="$([ -n "`git remote`" ] && git cherry)"
 
   if [[ $COUNT_ONLY == true ]]; then
     # If '-n' is specified, only count repo with changes/local-diff
diff --git a/tools/wiki/diary b/tools/wiki/diary
index ce7a5be..3995ecf 100755
--- a/tools/wiki/diary
+++ b/tools/wiki/diary
@@ -1,6 +1,6 @@
 #! /bin/bash
 
-today=~/log/diary/$(date --iso-8601).md
+today=~/log/`date +%y.w%W.md`
 
 specify_date() {
   YEAR=${YEAR:-22}