aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Nieder <jrnieder@gmail.com>2011-01-22 16:26:20 -0600
committerGuido G√ľnther <agx@sigxcpu.org>2011-01-23 13:22:05 +0100
commit2984d27001320390783266dd7d8f44ace752da76 (patch)
tree2ded83f4fd11fca0a720e084f22a0d915dc11e83
parentd0826367f95d1d0826d5660999276d88fb2f59b5 (diff)
git-import-dsc doc updates for new options
--author-is-committer and --author-date-is-committer-date
-rw-r--r--docs/manpages/git-import-dsc.sgml8
1 files changed, 6 insertions, 2 deletions
diff --git a/docs/manpages/git-import-dsc.sgml b/docs/manpages/git-import-dsc.sgml
index 3291b31..74f1fa8 100644
--- a/docs/manpages/git-import-dsc.sgml
+++ b/docs/manpages/git-import-dsc.sgml
@@ -150,14 +150,18 @@
<term><option>--author-is-committer</option>
</term>
<listitem>
- <para>When importing the Debian patch make use the author as comitter.</para>
+ <para>When importing the Debian patch, use the author identity as
+ comitter identity.</para>
</listitem>
</varlistentry>
<varlistentry>
<term><option>--author-date-is-committer-date</option>
</term>
<listitem>
- <para>When importing the Debian patch make use the author date as comitter date.</para>
+ <para>When importing the Debian patch, use the author date as
+ comitter date. <warning><para>Git will subtly misbehave if the
+ committer date of a commit is not later than or equal to all
+ its parents.</para></warning></para>
</listitem>
</varlistentry>
</variablelist>