From 2984d27001320390783266dd7d8f44ace752da76 Mon Sep 17 00:00:00 2001
From: Jonathan Nieder <jrnieder@gmail.com>
Date: Sat, 22 Jan 2011 16:26:20 -0600
Subject: git-import-dsc doc updates for new options

--author-is-committer and --author-date-is-committer-date
---
 docs/manpages/git-import-dsc.sgml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/docs/manpages/git-import-dsc.sgml b/docs/manpages/git-import-dsc.sgml
index 3291b312..74f1fa82 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>
-- 
cgit v1.2.3