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 | |
| parent | 2a5df0a2f45100dcf7e7caa55fe7dbf51e5b26bf (diff) | |
| download | git-buildpackage-c3c76ac7b6ffbfb2a005faddd57494ad674963bd.tar.gz git-buildpackage-c3c76ac7b6ffbfb2a005faddd57494ad674963bd.tar.bz2 git-buildpackage-c3c76ac7b6ffbfb2a005faddd57494ad674963bd.zip | |
gbp-pull: Better document --force and --redo-pq
| -rw-r--r-- | docs/manpages/gbp-pull.sgml | 11 | ||||
| -rwxr-xr-x | gbp-pull | 10 |
2 files changed, 12 insertions, 9 deletions
diff --git a/docs/manpages/gbp-pull.sgml b/docs/manpages/gbp-pull.sgml index 2f2b30ee..bc1e97c3 100644 --- a/docs/manpages/gbp-pull.sgml +++ b/docs/manpages/gbp-pull.sgml @@ -22,8 +22,8 @@ &gbp-pull; <arg><option>--verbose</option></arg> - <arg><option>--redo-pq</option></arg> <arg><option>--force</option></arg> + <arg><option>--redo-pq</option></arg> <arg><option>--[no-]pristine-tar</option></arg> <arg><option>--debian-branch=</option><replaceable>branch_name</replaceable></arg> <arg><option>--upstream-branch=</option><replaceable>branch_name</replaceable></arg> @@ -45,13 +45,16 @@ <varlistentry> <term><option>--force</option></term> <listitem> - <para>force update even if this results in a non fast forward update</para> + <para>force a branch update even if this results in a non fast + forward update. <warning><para>Forcing a branch updates + makes you lose your modifications.</para></warning></para> </listitem> </varlistentry> <varlistentry> <term><option>--redo-pq</option></term> <listitem> - <para>also rebuild the corresponding patch-queue using &gbp-pq;</para> + <para>also rebuild the corresponding patch-queue using &gbp-pq;. + <warning><para>This drops the patch-queue branch if it exists.</para></warning></para> </listitem> </varlistentry> <varlistentry> @@ -81,7 +84,7 @@ <term><option>--pristine-tar</option> </term> <listitem> - <para>generate pristine-tar delta file</para> + <para>Wheter to update the pristine-tar branch too.</para> </listitem> </varlistentry> </variablelist> @@ -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") |