construct import commits differently (merge separate from contents)

[dgit.git] / dgit.1

diff --git a/dgit.1 b/dgit.1
index 64a03cfd6bc291c128a66b93636d4a41e2c289a2..9a9f32e2730633b64eca7949df7aa4ccbc72917e 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
@@ -224,6 +225,8 @@ which will make the required pseudo-merge.
 
 If the dgit push fails halfway through, it should be restartable and
 idempotent.  However this is not true for the git tag operation.
+Also, it would be good to check that the proposed signing key is
+available before starting work.
 
 dgit's handling of .orig.tar.gz is not very sophisticated.  Ideally
 the .orig.tar.gz could be transported via the git repo as git tags.