diff options
Diffstat (limited to 'src/pyfedpkg/initial_merge.py')
| -rwxr-xr-x | src/pyfedpkg/initial_merge.py | 10 |
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, |