aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorGuido Guenther <agx@sigxcpu.org>2006-10-06 23:13:34 +0200
committerGuido Guenther <agx@bogon.sigxcpu.org>2006-10-06 23:13:34 +0200
commit73394bfe1613ac3bc02ec0dc96716e7338630bad (patch)
treea1aa478c771ba4b72b07063442decd21414adeea /docs
parent16425af87c8e566f5eff6b255c55ebf9159708c2 (diff)
minor cosmetic cleanups all over the place
Diffstat (limited to 'docs')
-rw-r--r--docs/git-import-orig.sgml11
1 files changed, 7 insertions, 4 deletions
diff --git a/docs/git-import-orig.sgml b/docs/git-import-orig.sgml
index 0b2d999..2da6e92 100644
--- a/docs/git-import-orig.sgml
+++ b/docs/git-import-orig.sgml
@@ -42,9 +42,9 @@
<refsect1>
<title>DESCRIPTION</title>
<para>
- &git-import-orig; tar.gz file given by tar_gz into the git-buildpackage
- repository. It tries to guess the version information from the tarball's
- filename but it can also be specified on the command line.
+ &git-import-orig; import a tar.gz file given by tar_gz into the
+ git-buildpackage repository. It tries to guess the version information from
+ the tarball's filename but it can also be specified on the command line.
When importing the new version <command>git_load_dirs</command> is being
used to detect file renames and removals.
@@ -73,7 +73,10 @@
<term><option>--debian-branch</option>=<replaceable>branch_name</replaceable>
</term>
<listitem>
- <para>The branch in the Git repository the Debian package is being developed on, default is 'master'</para>
+ <para>The branch in the Git repository the Debian package is being
+ developed on, default is 'master'. After importing the new sources on
+ the upstream branch, &git-import-orig; will try to merge the new
+ version onto this branch.</para>
</listitem>
</varlistentry>
<varlistentry>