chiark / gitweb /
construct import commits differently (merge separate from contents)
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 17 Aug 2013 10:59:04 +0000 (11:59 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 17 Aug 2013 10:59:04 +0000 (11:59 +0100)
dgit.1

diff --git a/dgit.1 b/dgit.1
index d4ce176..9a9f32e 100644 (file)
--- a/dgit.1
+++ b/dgit.1
@@ -84,8 +84,9 @@ branch) whose tree is identical to the unpacked source upload.
 
 Uploads not made by dgit are represented in git by commits which are
 synthesised by dgit.  The tree of each such commit corresponds to the
-unpacked source; the single parent is the last known upload - that is,
-the contents of the dgit/suite branch.
+unpacked source; there is an origin commit with the contents, and a
+psuedo-merge from last known upload - that is, from the contents of
+the dgit/suite branch.
 
 dgit expects repos that it works with to have a
 .B dgit