diff options
| author | Guido Guenther <agx@sigxcpu.org> | 2006-12-10 16:07:37 +0100 |
|---|---|---|
| committer | Guido Guenther <agx@bogon.sigxcpu.org> | 2006-12-10 16:07:37 +0100 |
| commit | ff7797932f04a625d92d7e63e9af5bfbe1076a9d (patch) | |
| tree | a17fcd130ef15482f6a4823b95b50ac2043b7a46 /docs/manpages/git-import-orig.sgml | |
| parent | 093704c9c7e16d71659c49661ce91c605bfabd45 (diff) | |
git-buildpackage: detect the branch we're on and bail out if it's not the debian branchdebian/0.2.18
Diffstat (limited to 'docs/manpages/git-import-orig.sgml')
| -rw-r--r-- | docs/manpages/git-import-orig.sgml | 26 |
1 files changed, 3 insertions, 23 deletions
diff --git a/docs/manpages/git-import-orig.sgml b/docs/manpages/git-import-orig.sgml index 0e507398..7bc169a7 100644 --- a/docs/manpages/git-import-orig.sgml +++ b/docs/manpages/git-import-orig.sgml @@ -30,6 +30,8 @@ <arg><option>--upstream-branch=<replaceable>branch_name</replaceable></option></arg> <arg><option>--debian-branch=<replaceable>branch_name</replaceable></option></arg> <arg><option>--upstream-version=<replaceable>version</replaceable></option></arg> + <arg><option>--sign-tags</option></arg> + <arg><option>--keyid</option></arg> <arg choice="plain"><replaceable>tar_gz</replaceable></arg> </cmdsynopsis> </refsynopsisdiv> @@ -85,29 +87,7 @@ </variablelist> </refsect1> <refsect1> - <title>CONFIGURATION FILES</title> - Three configuration files are parsed: - <variablelist> - <varlistentry> - <term>/etc/git-buildpacakge/gbp.conf</term> - </varlistentry> - <varlistitem>- system wide configuraton</varlistitem> - <varlistentry> - <term>~/.gbp.conf</term> - </varlistentry> - <varlistentry> - - per user configuration - </varlistentry> - <varlistentry> - <term>\.git/gbp.conf</term> - </varlistentry> - <varlistentry> - - per repository configuration - </varlistentry> - </variablelist> - <para> - See /etc/git-buildpacakge/gbp.conf for an example. - </para> + &man.git.config-files; </refsect1> <refsect1> <title>SEE ALSO</title> |