summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Ulrich Niedermann <hun@n-dimensional.de>2010-08-05 12:48:58 +0200
committerHans Ulrich Niedermann <hun@n-dimensional.de>2010-08-05 12:48:58 +0200
commit290d6343a59c0af0882d11efe0d7b57d0aa2dec7 (patch)
tree8a4d88991a46456d49559a94ed5bbc37ce8ea643
parente9886142f89fde4d7df7e1f43dbfea88c8ef03a5 (diff)
downloadfedora-packager-290d6343a59c0af0882d11efe0d7b57d0aa2dec7.tar.gz
fedora-packager-290d6343a59c0af0882d11efe0d7b57d0aa2dec7.tar.xz
fedora-packager-290d6343a59c0af0882d11efe0d7b57d0aa2dec7.zip
Improve initial-merge docs
-rwxr-xr-xsrc/pyfedpkg/initial_merge.py10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/pyfedpkg/initial_merge.py b/src/pyfedpkg/initial_merge.py
index 759518a..458ef46 100755
--- a/src/pyfedpkg/initial_merge.py
+++ b/src/pyfedpkg/initial_merge.py
@@ -2,9 +2,9 @@
# initial_merge.py - perform initial merge after dist-git migration
"""\
-"fedpkg initial-merge" performs a merge of all git branches with the same
-content in the directory tree, i.e. with the same package spec files,
-patches, etc.
+Performs a 'git merge' of all git branches with the same content
+(i.e. with the same package spec files, patch files, etc.), regardless
+of their history.
This is useful after Fedora's dist-cvs to dist-git migration, as often
different branches have different histories but the same content on the
@@ -195,10 +195,12 @@ def fedpkg_command(args):
_module_doc = __doc__
+
def get_parser(subparsers):
sp = subparsers.add_parser('initial-merge',
help = 'git merge to join branches with identical trees',
- epilog = _module_doc)
+ formatter_class=argparse.RawDescriptionHelpFormatter,
+ description = _module_doc)
sp.add_argument('-n', '--dry-run',
dest='dry_run',
action='store_const', const=True,