summaryrefslogtreecommitdiffhomepage
path: root/docs
diff options
context:
space:
mode:
authorGuido Günther <agx@sigxcpu.org>2009-08-23 16:46:15 +0200
committerGuido Günther <agx@sigxcpu.org>2009-08-23 18:40:14 +0200
commitee6c23824949baec5c7333a4933f64504d1a62d4 (patch)
tree81956c9da3fba84c78b2d5a8c390ef90a5f8c946 /docs
parentdcbe091422807d7bd0aede336ab1d12dd65384e5 (diff)
add postimport hook for git-import-orig
Allows to run git-dch after import. Drop the dch invocation and warn when --no-dch gets passed on the commandline. Closes: #520355
Diffstat (limited to 'docs')
-rw-r--r--docs/manpages/git-import-orig.sgml15
1 files changed, 8 insertions, 7 deletions
diff --git a/docs/manpages/git-import-orig.sgml b/docs/manpages/git-import-orig.sgml
index 7c19adf6..84811b48 100644
--- a/docs/manpages/git-import-orig.sgml
+++ b/docs/manpages/git-import-orig.sgml
@@ -24,7 +24,6 @@
<arg><option>--verbose</option></arg>
<arg><option>--upstream-version=</option><replaceable>version</replaceable></arg>
<arg><option>--no-merge</option></arg>
- <arg><option>--no-dch</option></arg>
<arg><option>--upstream-branch=</option><replaceable>branch_name</replaceable></arg>
<arg><option>--debian-branch=</option><replaceable>branch_name</replaceable></arg>
<arg><option>--[no-]sign-tags</option></arg>
@@ -33,6 +32,7 @@
<arg><option>--filter=</option><replaceable>pattern</replaceable></arg>
<arg><option>--[no-]pristine-tar</option></arg>
<arg><option>--[no-]filter-pristine-tar</option></arg>
+ <arg><option>--postimport=cmd</option></arg>
<arg choice="plain"><replaceable>upstream-source</replaceable></arg>
</cmdsynopsis>
</refsynopsisdiv>
@@ -70,12 +70,7 @@
<para>Don't merge the upstream version to the development branch</para>
</listitem>
</varlistentry>
- <varlistentry>
- <term><option>--no-dch</option></term>
- <listitem>
- <para>don't call dch after the import</para>
- </listitem>
- </varlistentry>
+
<varlistentry>
<term><option>--upstream-branch</option>=<replaceable>branch_name</replaceable>
</term>
@@ -145,6 +140,12 @@
passed to pristine tar</para>
</listitem>
</varlistentry>
+ <varlistentry>
+ <term><option>--postimport=<replaceable>cmd</replaceable></option></term>
+ <listitem>
+ <para>run <replaceable>cmd</replaceable> after the import.</para>
+ </listitem>
+ </varlistentry>
</variablelist>
</refsect1>
<refsect1>