In discussion on how to start using dgit when already using git, do not imply/assume...

diff --git a/debian/changelog b/debian/changelog
index 47956f4cbd138d4a37956b284f4957cf9d0a6350..b8601e34ab96a94c96490f3e7eeffe7ad239a8ba 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,9 @@ dgit (1.1) unstable; urgency=low
   * In manpage, do not seem to imply that NMU should be of only one
     new commit.
   * Qualify to Debian the manpage comment about how to do NMU.
+  * In discussion on how to start using dgit when already using git, do
+    not imply/assume that existing git history will have identical trees
+    to dgit history.
 
  --
 

diff --git a/dgit.1 b/dgit.1
index 8ddab7a74211295603af73b5c78dc30930ecf0b3..1204f4e16a0a6e930b0c7f475aed550e798e7ff5 100644 (file)
--- a/dgit.1
+++ b/dgit.1
@@ -566,7 +566,7 @@ branch
 and merge that other commit
 .RB ( "git merge debian/" \fIversion\fR).
 Hopefully this merge will be trivial because the two trees should
-be the same.  The resulting branch head can be merged into your
+be very similar.  The resulting branch head can be merged into your
 working branches
 .RB ( "git checkout master && git merge dgit/" \fIsuite\fR).