X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=dgit.1;h=6ee22e822082330ad82f2f2d0ac85c27a82881d2;hb=00c7c161dc66c4db4645b2cfd90d810a17a08f46;hp=ef5236a4ce70c3aaadd637ba87ba948069ec51e8;hpb=c4a96d7a9ed9f83abed11a84f7fe068e27dee2b1;p=dgit.git diff --git a/dgit.1 b/dgit.1 index ef5236a4..6ee22e82 100644 --- a/dgit.1 +++ b/dgit.1 @@ -489,7 +489,7 @@ push will still ensure that the .dsc you upload and the git tree you push are identical, so this option won't make broken pushes.) .TP .BR --overwrite [=\fIprevious-version\fR] -Declare that even though your git branch is not a descendant +Declare that even though your git branch may not be a descendant of the version in the archive according to the revision history, it really does contain @@ -510,7 +510,7 @@ changes unless someone committed to git a finalised changelog entry, and then made later changes to that version.) dgit push --overwrite -will make a +will, if necessary, make a pseudo-merge (that is, something that looks like the result of git merge -s ours) to stitch the archive's version into your own git history, so that your push is a fast forward from the archive.