# 
# 
# patch "contrib/usher.cc"
#  from [96ebe95bde3ae2d7e40c9c659a854177c3500c7f]
#    to [89284654d97de64f5fc60334b8f3e61be7230cd9]
# 
============================================================
--- contrib/usher.cc	96ebe95bde3ae2d7e40c9c659a854177c3500c7f
+++ contrib/usher.cc	89284654d97de64f5fc60334b8f3e61be7230cd9
@@ -15,6 +15,7 @@
 // Usage: usher [-l address[:port]] [-a address:port] [-p pidfile] <server-file>
 //
 // options:
+// -m   the monotone command, defaults to "monotone"
 // -l   address and port to listen on, defaults to 0.0.0.0:4691
 // -a   address and port to listen for admin commands
 // -p   a file (deleted on program exit) to record the pid of the usher in
@@ -159,6 +160,7 @@
 // defaults, overridden by command line
 int listenport = 4691;
 string listenaddr = "0.0.0.0";
+string monotone = "monotone";
 
 // keep local servers around for this many seconds after the last
 // client disconnects from them (only accurate to ~10 seconds)
@@ -1414,7 +1416,9 @@
         listenaddr = lp.substr(0, c);
         if (c != lp.npos)
           listenport = lexical_cast<int>(lp.substr(c+1));
-      } else if (string(argv[i]) == "-a")
+      } else if (string(argv[i]) == "-m")
+        monotone = argv[i++];
+      else if (string(argv[i]) == "-a")
         admin.initialize(argv[++i]);
       else if (string(argv[i]) == "-p")
         pf.initialize(argv[++i]);