diff options
| author | Guido Guenther <agx@sigxcpu.org> | 2007-05-24 09:38:30 +0200 |
|---|---|---|
| committer | Guido Guenther <agx@bogon.sigxcpu.org> | 2007-05-24 09:38:30 +0200 |
| commit | b9cac7d9e1da408262ca6fd0461857cdd15f182b (patch) | |
| tree | d8922c568e80e0a6d526223c4c190781c0c093d0 /docs/manpages/git-import-orig.sgml | |
| parent | fe0594675ff802b7ec19e98704791b03e50ff824 (diff) | |
make the documented command line arguments match reality
Diffstat (limited to 'docs/manpages/git-import-orig.sgml')
| -rw-r--r-- | docs/manpages/git-import-orig.sgml | 33 |
1 files changed, 21 insertions, 12 deletions
diff --git a/docs/manpages/git-import-orig.sgml b/docs/manpages/git-import-orig.sgml index 4853e78a..a28047ec 100644 --- a/docs/manpages/git-import-orig.sgml +++ b/docs/manpages/git-import-orig.sgml @@ -22,6 +22,8 @@ &git-import-orig; <arg><option>--verbose</option></arg> + <arg><option>--upstream-version=</option><replaceable>version</replaceable></arg> + <arg><option>--no-merge</option></arg> <arg><option>--upstream-branch=</option><replaceable>branch_name</replaceable></arg> <arg><option>--debian-branch=</option><replaceable>branch_name</replaceable></arg> <arg><option>--upstream-version=</option><replaceable>version</replaceable></arg> @@ -34,15 +36,16 @@ <refsect1> <title>DESCRIPTION</title> <para> - &git-import-orig; imports the tar.gz archive given by - <replaceable>upstream-source</replaceable> into the &git; repository. If - <replaceable>upstream-source</replaceable> is already of the form - <replaceable>package-name_version.orig.tar.gz</replaceable>, it reads the - version information from the tarball's filename otherwise it can be - specified on the commandline via <option>--upstream-version</option>. + &git-import-orig; imports <replaceable>upstream-source</replaceable> into + the &git; repository. <replaceable>upstream-source</replaceable> can either + be a gzip or bzip2 compressed tar archive or an alreay unpacked source + tree. If it is already of the form + <replaceable>package-name_version.orig.tar.gz</replaceable>, the version + information is read from the tarball's filename otherwise it can be + given on the command line via <option>--upstream-version</option>. - When importing the new version <command>git_load_dirs</command> is being - used to detect file renames and removals. + Upon import <command>git_load_dirs</command> is being used to detect file + renames and removals. </para> </refsect1> <refsect1> @@ -50,13 +53,19 @@ <variablelist> <varlistentry> - <term><option>--upstream-version</option>=<replaceable>version</replaceable>, - <option>-u</option><replaceable>version</replaceable></term> + <term><option>--upstream-version</option>=<replaceable>version</replaceable></term> + <term><option>-u</option><replaceable>version</replaceable></term> <listitem> <para>The upstream version number</para> </listitem> </varlistentry> <varlistentry> + <term><option>--no-merge</option></term> + <listitem> + <para>Don't merge the upstream version to the development branch</para> + </listitem> + </varlistentry> + <varlistentry> <term><option>--upstream-branch</option>=<replaceable>branch_name</replaceable> </term> <listitem> @@ -75,8 +84,8 @@ </listitem> </varlistentry> <varlistentry> - <term><option>--verbose</option>, <option>-v</option> - </term> + <term><option>--verbose</option></term> + <term><option>-v</option></term> <listitem> <para>verbose execution</para> </listitem> |