diff options
author | Guido Günther <agx@sigxcpu.org> | 2010-12-27 21:42:55 +0100 |
---|---|---|
committer | Guido Günther <agx@sigxcpu.org> | 2010-12-27 21:50:43 +0100 |
commit | c3c76ac7b6ffbfb2a005faddd57494ad674963bd (patch) | |
tree | 47d1a44d23f40ccfb5b680edc4126ac6cb5a8fdd /gbp-pull | |
parent | 2a5df0a2f45100dcf7e7caa55fe7dbf51e5b26bf (diff) |
gbp-pull: Better document --force and --redo-pq
Diffstat (limited to 'gbp-pull')
-rwxr-xr-x | gbp-pull | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -70,15 +70,15 @@ def main(argv): parser = GbpOptionParser(command=os.path.basename(argv[0]), prefix='', usage='%prog [options] - safely update a repository from remote') - branch_group = GbpOptionGroup(parser, "branch options", "branch layout options") + branch_group = GbpOptionGroup(parser, "branch options", "branch update and layout options") parser.add_option_group(branch_group) + branch_group.add_option("--force", action="store_true", dest="force", default=False, + help="force a branch update even if can't be fast forwarded") + branch_group.add_option("--redo-pq", action="store_true", dest="redo_pq", default=False, + help="redo the patch queue branch after a pull. Warning: this drops the old patch-queue branch") branch_group.add_config_file_option(option_name="upstream-branch", dest="upstream_branch") branch_group.add_config_file_option(option_name="debian-branch", dest="debian_branch") branch_group.add_boolean_config_file_option(option_name="pristine-tar", dest="pristine_tar") - parser.add_option("--force", action="store_true", dest="force", default=False, - help="force update even if not fast forward") - parser.add_option("--redo-pq", action="store_true", dest="redo_pq", default=False, - help="Redo the patch queue branch after a pull. Warning: this drops the old patch-queue branch") parser.add_option("-v", "--verbose", action="store_true", dest="verbose", default=False, help="verbose command execution") parser.add_config_file_option(option_name="color", dest="color") |