From 86f51ec2fd92d5289f9a7b42960ee40d436f57c8 Mon Sep 17 00:00:00 2001
From: Jonathan Davies <jpds@ubuntu.com>
Date: Thu, 26 Mar 2009 22:48:07 +0000
Subject: [PATCH 1/2] * grab-merge: Added --help option.

---
 debian/changelog |  1 +
 grab-merge       | 10 ++++++++++
 2 files changed, 11 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 6b860c1..7276440 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 ubuntu-dev-tools (0.72) UNRELEASED; urgency=low
 
   * README.updates: Added - lists steps to take when updating this package.
+  * grab-merge: Added --help option.
 
  -- Jonathan Davies <jpds@ubuntu.com>  Thu, 26 Mar 2009 00:22:01 +0000
 
diff --git a/grab-merge b/grab-merge
index 70aa88a..31b967d 100755
--- a/grab-merge
+++ b/grab-merge
@@ -29,6 +29,16 @@ set -e
 
 MERGE=$1
 
+if [ "$1" = "-h" ] || [ "$1" = "--help" ]; then
+    echo "Usage: $0 <package name>"
+    echo ""
+    echo "grab-merge downloads a merge's packaging files and report from"
+    echo "merges.ubuntu.com, placing them into a new subdirectory for working"
+    echo "from."
+
+    exit 0
+fi
+
 if [ "$SUBDIR" = "y" ]; then
     [ -d "$MERGE" ] || mkdir $MERGE
     cd $MERGE

From 97c43e379fead6647397b9b1ce663290d9a2dff7 Mon Sep 17 00:00:00 2001
From: Jonathan Davies <jpds@ubuntu.com>
Date: Thu, 26 Mar 2009 22:53:43 +0000
Subject: [PATCH 2/2] Added new manpage for grab-merge.

---
 debian/changelog |  2 +-
 doc/grab-merge.1 | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 doc/grab-merge.1

diff --git a/debian/changelog b/debian/changelog
index 7276440..0915d5e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,7 @@
 ubuntu-dev-tools (0.72) UNRELEASED; urgency=low
 
   * README.updates: Added - lists steps to take when updating this package.
-  * grab-merge: Added --help option.
+  * grab-merge: Added --help option and manpage (LP: #349109).
 
  -- Jonathan Davies <jpds@ubuntu.com>  Thu, 26 Mar 2009 00:22:01 +0000
 
diff --git a/doc/grab-merge.1 b/doc/grab-merge.1
new file mode 100644
index 0000000..3fab6fd
--- /dev/null
+++ b/doc/grab-merge.1
@@ -0,0 +1,18 @@
+.TH grab\-merge 1 "Marh 26, 2009" "ubuntu-dev-tools"
+
+.SH NAME
+grab\-merge \- grab's a merge's files from merges.ubuntu.com.
+
+.SH SYNOPSIS
+\fBgrab\-merge\fP <\fIpackage name\fP>
+
+.SH DESCRIPTION
+\fB404main\fP is a script that downloads a merge's packaging files and report
+from merges.ubuntu.com. Placing them in a new directory for working from.
+
+.SH AUTHORS
+\fBgrab\-merge\fP was written by Scott James Remnant <scott@ubuntu.com> and
+this manpage by Jonathan Davies <jpds@ubuntu.com>.
+.PP
+Both are released under the GNU General Public License, version 2 or
+later.