diff options
Diffstat (limited to 'dgit.1')
| -rw-r--r-- | dgit.1 | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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. |