From: Michael Vrable <mvrable@google.com>
Date: Tue, 25 Sep 2012 21:03:43 +0000 (-0700)
Subject: Update usage text for new include/exclude filtering mechanism.
X-Git-Url: http://git.vrable.net/?p=cumulus.git;a=commitdiff_plain;h=36e15463221ffb8f2e1dc9903705d7be81d1d1f8

Update usage text for new include/exclude filtering mechanism.
---

diff --git a/main.cc b/main.cc
index 15ddfc6..6b9f457 100644
--- a/main.cc
+++ b/main.cc
@@ -653,8 +653,10 @@ void usage(const char *program)
         "  --dest=PATH          path where backup is to be written\n"
         "  --upload-script=COMMAND\n"
         "                       program to invoke for each backup file generated\n"
-        "  --exclude=PATH       exclude files in PATH from snapshot\n"
-        "  --exclude-name=NAME  exclude files called NAME from snapshot\n"
+        "  --exclude=PATTERN    exclude files matching PATTERN from snapshot\n"
+        "  --include=PATTERN    include files matching PATTERN in snapshot\n"
+        "  --dir-merge=PATTERN  parse files matching PATTERN to read additional\n"
+        "                       subtree-specific include/exclude rules during backup\n"
         "  --localdb=PATH       local backup metadata is stored in PATH\n"
         "  --tmpdir=PATH        path for temporarily storing backup files\n"
         "                           (defaults to TMPDIR environment variable or /tmp)\n"