From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Mon, 20 Jul 2015 12:35:47 +0000 (+0100)
Subject: In discussion on how to start using dgit when already using git, do not imply/assume... 
X-Git-Tag: debian/1.1~67
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=ac2a575234ee8d5fff62cfd5d181ecfab95be497;ds=sidebyside

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/debian/changelog b/debian/changelog
index 47956f4c..b8601e34 100644
--- 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 8ddab7a7..1204f4e1 100644
--- 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).