aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGuido Günther <agx@sigxcpu.org>2016-10-21 13:30:54 +0200
committerGuido Günther <agx@sigxcpu.org>2016-10-23 17:15:58 +0200
commiteb3be9201c39deb003670c68dc4389db5f026d37 (patch)
tree4cd5e09a284eafe4836c90deb221eba924590755
parent507ae509d37dddaf78af8e45b1af792bb8513825 (diff)
import-orig: Give some context on --merge-mode=replace option
-rw-r--r--docs/manpages/gbp-import-orig.sgml16
1 files changed, 13 insertions, 3 deletions
diff --git a/docs/manpages/gbp-import-orig.sgml b/docs/manpages/gbp-import-orig.sgml
index 2696f2b4..1e86a94d 100644
--- a/docs/manpages/gbp-import-orig.sgml
+++ b/docs/manpages/gbp-import-orig.sgml
@@ -59,9 +59,19 @@
for it unless <option>--no-interactive</option> is given.
</para>
<para>
- The sources are placed on the upstream branch (default:
- <replaceable>upstream</replaceable>), tagged and merged onto the debian
- branch (default: <replaceable>master</replaceable>).
+ The sources are placed on the upstream branch (default:
+ <replaceable>upstream</replaceable>), tagged and merged onto the
+ debian branch (default: <replaceable>master</replaceable>). This
+ is either done using <command>git merge</command> in case
+ of <option>--merge-mode=</option><replaceable>merge</replaceable>
+ (the default) or by creating a new tree that consists of the new
+ upstream version plus the <filename>debian/</filename>
+ directory. This behaviour can be enabled via
+ the <option>--merge-mode=</option><replaceable>replace</replaceable>
+ option and is preferable for source format 3.0 (quilt) packages
+ since direct modifications of the upstream sources are not
+ allowed in that format and so a 1:1 replacement of the upstream
+ sources is almost always desired.
</para>
<para>In case of an error &gbp-import-orig; will rollback (undo)
all changes it has done to the repository (see