From: Wayne Davison <wayned@samba.org>
Date: Sat, 23 May 2009 20:40:23 +0000 (-0700)
Subject: Improved the usage output.
X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/commitdiff_plain/9ba4d44fa8a4fb1b3d79602d0d8744d464f5c60c

Improved the usage output.
---

diff --git a/packaging/patch-update b/packaging/patch-update
index 241cd16a..135b7e48 100755
--- a/packaging/patch-update
+++ b/packaging/patch-update
@@ -227,9 +227,15 @@ sub check_git_status
 sub usage
 {
     die <<EOT;
-Usage: patch-update [OPTIONS]
-
---gen[=DIR]   Include generated files.  Optional dest DIR overrides "patches".
---skip-check  Skip the check that ensures starting with a clean branch.
+Usage: patch-update [OPTIONS] [patches/DIFF...]
+
+Options:
+-b, --branch=BRANCH  The master branch to merge into the patch/* branches.
+    --gen[=DIR]      Include generated files.  Optional destination DIR
+                     arg overrides the default of using the "patches" dir.
+    --skip-check     Skip the check that ensures starting with a clean branch.
+-s, --shell          Launch a shell for every patch/* branch updated, not
+                     just when a conflict occurs.
+-h, --help           Output this help message.
 EOT
 }