1 # SOME DESCRIPTIVE TITLE
2 # Copyright (C) YEAR Free Software Foundation, Inc.
3 # This file is distributed under the same license as the PACKAGE package.
4 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
9 "Project-Id-Version: PACKAGE VERSION\n"
10 "POT-Creation-Date: 2019-09-08 20:11+0100\n"
11 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
12 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13 "Language-Team: LANGUAGE <LL@li.org>\n"
16 "Content-Type: text/plain; charset=UTF-8\n"
17 "Content-Transfer-Encoding: 8bit\n"
20 #: ../dgit.1:3 ../dgit.7:2 ../dgit-user.7.pod:1 ../dgit-nmu-simple.7.pod:1
21 #: ../dgit-maint-native.7.pod:1 ../dgit-maint-merge.7.pod:1
22 #: ../dgit-maint-gbp.7.pod:1 ../dgit-maint-debrebase.7.pod:1
23 #: ../dgit-downstream-dsc.7.pod:1 ../dgit-sponsorship.7.pod:1
24 #: ../dgit-maint-bpo.7.pod:1 ../git-debrebase.1.pod:1 ../git-debrebase.5.pod:1
25 #: ../git-debpush.1.pod:1
31 #: ../dgit.1:286 ../dgit-maint-merge.7.pod:476
37 #: ../dgit.1:287 ../dgit-maint-merge.7.pod:480
43 #: ../dgit.1:288 ../dgit-maint-merge.7.pod:485
49 #: ../dgit.1:1568 ../dgit.7:23 ../dgit-user.7.pod:447
50 #: ../dgit-nmu-simple.7.pod:137 ../dgit-maint-native.7.pod:126
51 #: ../dgit-maint-merge.7.pod:521 ../dgit-maint-gbp.7.pod:136
52 #: ../dgit-maint-debrebase.7.pod:778 ../dgit-downstream-dsc.7.pod:352
53 #: ../dgit-sponsorship.7.pod:321 ../dgit-maint-bpo.7.pod:134
54 #: ../git-debrebase.1.pod:633 ../git-debrebase.5.pod:678
55 #: ../git-debpush.1.pod:254
61 #: ../dgit-user.7.pod:5 ../dgit-maint-native.7.pod:5
62 #: ../dgit-maint-merge.7.pod:5 ../dgit-maint-gbp.7.pod:5
63 #: ../dgit-maint-debrebase.7.pod:5 ../dgit-downstream-dsc.7.pod:5
64 #: ../dgit-maint-bpo.7.pod:5 ../git-debrebase.5.pod:5
69 #: ../dgit-user.7.pod:449 ../dgit-maint-native.7.pod:128
70 #: ../dgit-maint-merge.7.pod:523 ../dgit-maint-gbp.7.pod:138
71 msgid "dgit(1), dgit(7)"
75 #: ../dgit-maint-native.7.pod:107 ../dgit-maint-merge.7.pod:514
83 #: ../dgit-maint-merge.7.pod:3
85 "dgit - tutorial for package maintainers, using a workflow centered around "
90 #: ../dgit-maint-merge.7.pod:7
92 "This document describes elements of a workflow for maintaining a non-native "
93 "Debian package using B<dgit>. The workflow makes the following opinionated "
98 #: ../dgit-maint-merge.7.pod:15
100 "Git histories should be the non-linear histories produced by git-merge(1), "
101 "preserving all information about divergent development that was later "
106 #: ../dgit-maint-merge.7.pod:21
108 "Maintaining convenient and powerful git workflows takes priority over the "
109 "usefulness of the raw Debian source package. The Debian archive is thought "
110 "of as an output format."
114 #: ../dgit-maint-merge.7.pod:25
116 "For example, we don't spend time curating a series of quilt patches. "
117 "However, in straightforward cases, the information such a series would "
118 "contain is readily available from B<dgit-repos>."
122 #: ../dgit-maint-merge.7.pod:33
124 "It is more important to have the Debian package's git history be a "
125 "descendent of upstream's git history than to use exactly the orig.tar that "
126 "upstream makes available for download."
130 #: ../dgit-maint-merge.7.pod:39
132 "This workflow is less suitable for some packages. When the Debian delta "
133 "contains multiple pieces which interact, or which you aren't going to be "
134 "able to upstream soon, it might be preferable to maintain the delta as a "
135 "rebasing patch series. For such a workflow see for example dgit-maint-"
136 "debrebase(7) and dgit-maint-gbp(7)."
140 #: ../dgit-maint-merge.7.pod:47 ../dgit-maint-debrebase.7.pod:61
141 msgid "INITIAL DEBIANISATION"
145 #: ../dgit-maint-merge.7.pod:49 ../dgit-maint-debrebase.7.pod:63
147 "This section explains how to start using this workflow with a new package. "
148 "It should be skipped when converting an existing package to this workflow."
152 #: ../dgit-maint-merge.7.pod:53 ../dgit-maint-merge.7.pod:361
153 #: ../dgit-maint-merge.7.pod:438 ../dgit-maint-debrebase.7.pod:67
154 #: ../dgit-maint-debrebase.7.pod:352
155 msgid "When upstream tags releases in git"
159 #: ../dgit-maint-merge.7.pod:55 ../dgit-maint-debrebase.7.pod:69
161 "Suppose that the latest stable upstream release is 1.2.2, and this has been "
162 "tagged '1.2.2' by upstream."
166 #: ../dgit-maint-merge.7.pod:60 ../dgit-maint-debrebase.7.pod:74
169 " % git clone -oupstream https://some.upstream/foo.git\n"
171 " % git verify-tag 1.2.2\n"
172 " % git reset --hard 1.2.2\n"
173 " % git branch --unset-upstream\n"
178 #: ../dgit-maint-merge.7.pod:68
180 "The final command detaches your master branch from the upstream remote, so "
181 "that git doesn't try to push anything there, or merge unreleased upstream "
182 "commits. If you want to maintain a copy of your packaging branch on B<salsa."
183 "debian.org> in addition to B<dgit-repos>, you can do something like this:"
187 #: ../dgit-maint-merge.7.pod:76 ../dgit-maint-debrebase.7.pod:90
190 " % git remote add -f origin salsa.debian.org:Debian/foo.git\n"
191 " % git push --follow-tags -u origin master\n"
196 #: ../dgit-maint-merge.7.pod:81
198 "Now go ahead and Debianise your package. Just make commits on the master "
199 "branch, adding things in the I<debian/> directory. If you need to patch the "
200 "upstream source, just make commits that change files outside of the I<debian/"
201 "> directory. It is best to separate commits that touch I<debian/> from "
202 "commits that touch upstream source, so that the latter can be cherry-picked "
207 #: ../dgit-maint-merge.7.pod:88
209 "Note that there is no need to maintain a separate 'upstream' branch, unless "
210 "you also happen to be involved in upstream development. We work with "
211 "upstream tags rather than any branches, except when forwarding patches (see "
212 "FORWARDING PATCHES UPSTREAM, below)."
216 #: ../dgit-maint-merge.7.pod:93 ../dgit-maint-debrebase.7.pod:102
217 msgid "Finally, you need an orig tarball:"
221 #: ../dgit-maint-merge.7.pod:97 ../dgit-maint-merge.7.pod:432
222 #: ../dgit-maint-debrebase.7.pod:106 ../dgit-maint-debrebase.7.pod:419
230 #: ../dgit-maint-merge.7.pod:101 ../dgit-maint-debrebase.7.pod:110
231 msgid "See git-deborig(1) if this fails."
235 #: ../dgit-maint-merge.7.pod:103 ../dgit-maint-debrebase.7.pod:112
237 "This tarball is ephemeral and easily regenerated, so we don't commit it "
238 "anywhere (e.g. with tools like pristine-tar(1))."
242 #: ../dgit-maint-merge.7.pod:106
243 msgid "Verifying upstream's tarball releases"
247 #: ../dgit-maint-merge.7.pod:110
249 "It can be a good idea to compare upstream's released tarballs with the "
250 "release tags, at least for the first upload of the package. If they are "
251 "different, you might need to add some additional steps to your I<debian/"
252 "rules>, such as running autotools."
256 #: ../dgit-maint-merge.7.pod:115
258 "A convenient way to perform this check is to import the tarball as described "
259 "in the following section, using a different value for 'upstream-tag', and "
260 "then use git-diff(1) to compare the imported tarball to the release tag. If "
261 "they are the same, you can use upstream's tarball instead of running git-"
266 #: ../dgit-maint-merge.7.pod:123 ../dgit-maint-debrebase.7.pod:137
267 msgid "Using untagged upstream commits"
271 #: ../dgit-maint-merge.7.pod:127 ../dgit-maint-debrebase.7.pod:141
273 "Sometimes upstream does not tag their releases, or you want to package an "
274 "unreleased git snapshot. In such a case you can create your own upstream "
275 "release tag, of the form B<upstream/>I<ver>, where I<ver> is the upstream "
276 "version you plan to put in I<debian/changelog>. The B<upstream/> prefix "
277 "ensures that your tag will not clash with any tags upstream later creates."
281 #: ../dgit-maint-merge.7.pod:134 ../dgit-maint-debrebase.7.pod:148
283 "For example, suppose that the latest upstream release is 1.2.2 and you want "
284 "to package git commit ab34c21 which was made on 2013-12-11. A common "
285 "convention is to use the upstream version number 1.2.2+git20131211.ab34c21 "
286 "and so you could use"
290 #: ../dgit-maint-merge.7.pod:141 ../dgit-maint-debrebase.7.pod:155
293 " % git tag -s upstream/1.2.2+git20131211.ab34c21 ab34c21\n"
298 #: ../dgit-maint-merge.7.pod:145 ../dgit-maint-debrebase.7.pod:159
299 msgid "to obtain a release tag, and then proceed as above."
303 #: ../dgit-maint-merge.7.pod:149 ../dgit-maint-merge.7.pod:373
304 #: ../dgit-maint-merge.7.pod:463 ../dgit-maint-debrebase.7.pod:163
305 #: ../dgit-maint-debrebase.7.pod:364
306 msgid "When upstream releases only tarballs"
310 #: ../dgit-maint-merge.7.pod:151
312 "We need a virtual upstream branch with virtual release tags. gbp-import-"
313 "orig(1) can manage this for us. To begin"
317 #: ../dgit-maint-merge.7.pod:156 ../dgit-maint-debrebase.7.pod:171
327 #: ../dgit-maint-merge.7.pod:162 ../dgit-maint-debrebase.7.pod:177
328 msgid "Now create I<debian/gbp.conf>:"
332 #: ../dgit-maint-merge.7.pod:166 ../dgit-maint-debrebase.7.pod:181
336 " upstream-branch = upstream\n"
337 " debian-branch = master\n"
338 " upstream-tag = %(version)s\n"
343 #: ../dgit-maint-merge.7.pod:171 ../dgit-maint-debrebase.7.pod:186
346 " sign-tags = True\n"
347 " pristine-tar = False\n"
348 " pristine-tar-commit = False\n"
353 #: ../dgit-maint-merge.7.pod:175 ../dgit-maint-debrebase.7.pod:190
357 " merge-mode = merge\n"
362 #: ../dgit-maint-merge.7.pod:180 ../dgit-maint-debrebase.7.pod:195
363 msgid "gbp-import-orig(1) requires a pre-existing upstream branch:"
367 #: ../dgit-maint-merge.7.pod:184 ../dgit-maint-debrebase.7.pod:199
370 " % git add debian/gbp.conf && git commit -m \"create gbp.conf\"\n"
371 " % git checkout --orphan upstream\n"
373 " % git commit --allow-empty -m \"initial, empty branch for upstream source\"\n"
374 " % git checkout -f master\n"
379 #: ../dgit-maint-merge.7.pod:192 ../dgit-maint-debrebase.7.pod:207
380 msgid "Then we can import the upstream version:"
384 #: ../dgit-maint-merge.7.pod:196 ../dgit-maint-debrebase.7.pod:211
387 " % gbp import-orig --merge-mode=replace ../foo_1.2.2.orig.tar.xz\n"
392 #: ../dgit-maint-merge.7.pod:200 ../dgit-maint-debrebase.7.pod:215
394 "Our upstream branch cannot be pushed to B<dgit-repos>, but since we will "
395 "need it whenever we import a new upstream version, we must push it "
396 "somewhere. The usual choice is B<salsa.debian.org>:"
400 #: ../dgit-maint-merge.7.pod:206 ../dgit-maint-debrebase.7.pod:221
403 " % git remote add -f origin salsa.debian.org:Debian/foo.git\n"
404 " % git push --follow-tags -u origin master upstream\n"
409 #: ../dgit-maint-merge.7.pod:211
411 "You are now ready to proceed as above, making commits to both the upstream "
412 "source and the I<debian/> directory."
416 #: ../dgit-maint-merge.7.pod:214 ../dgit-maint-debrebase.7.pod:233
417 msgid "CONVERTING AN EXISTING PACKAGE"
421 #: ../dgit-maint-merge.7.pod:216 ../dgit-maint-debrebase.7.pod:235
423 "This section explains how to convert an existing Debian package to this "
424 "workflow. It should be skipped when debianising a new package."
428 #: ../dgit-maint-merge.7.pod:219
429 msgid "No existing git history"
433 #: ../dgit-maint-merge.7.pod:223
436 " % dgit clone foo\n"
438 " % git remote add -f upstream https://some.upstream/foo.git\n"
443 #: ../dgit-maint-merge.7.pod:229
444 msgid "Existing git history using another workflow"
448 #: ../dgit-maint-merge.7.pod:231
450 "First, if you don't already have the git history locally, clone it, and "
451 "obtain the corresponding orig.tar from the archive:"
455 #: ../dgit-maint-merge.7.pod:236
458 " % git clone git.debian.org:collab-maint/foo\n"
465 #: ../dgit-maint-merge.7.pod:242
466 msgid "Now dump any existing patch queue:"
470 #: ../dgit-maint-merge.7.pod:246
473 " % git rm -rf debian/patches\n"
474 " % git commit -m \"drop existing quilt patch queue\"\n"
479 #: ../dgit-maint-merge.7.pod:251
480 msgid "Then make new upstream tags available:"
484 #: ../dgit-maint-merge.7.pod:255 ../dgit-maint-debrebase.7.pod:266
487 " % git remote add -f upstream https://some.upstream/foo.git\n"
492 #: ../dgit-maint-merge.7.pod:259
493 msgid "dgit-test dpkg-source-ignores begin"
497 #: ../dgit-maint-merge.7.pod:261
499 "Now you simply need to ensure that your git HEAD is dgit-compatible, i.e., "
500 "it is exactly what you would get if you ran B<dpkg-buildpackage -i'(?:^|/)\\."
501 "git(?:/|$)' -I.git -S> and then unpacked the resultant source package."
505 #: ../dgit-maint-merge.7.pod:266
506 msgid "dgit-test dpkg-source-ignores end"
510 #: ../dgit-maint-merge.7.pod:268 ../dgit-maint-debrebase.7.pod:320
512 "To achieve this, you might need to delete I<debian/source/local-options>. "
513 "One way to have dgit check your progress is to run B<dgit build-source>."
517 #: ../dgit-maint-merge.7.pod:272
519 "The first dgit push will require I<--overwrite>. If this is the first ever "
520 "dgit push of the package, consider passing I<--deliberately-not-fast-"
521 "forward> instead of I<--overwrite>. This avoids introducing a new origin "
522 "commit into your git history. (This origin commit would represent the most "
523 "recent non-dgit upload of the package, but this should already be "
524 "represented in your git history.)"
528 #: ../dgit-maint-merge.7.pod:279
529 msgid "SOURCE PACKAGE CONFIGURATION"
533 #: ../dgit-maint-merge.7.pod:281
534 msgid "debian/source/options"
538 #: ../dgit-maint-merge.7.pod:283
540 "We set some source package options such that dgit can transparently handle "
541 "the \"dropping\" and \"refreshing\" of changes to the upstream source:"
545 #: ../dgit-maint-merge.7.pod:289
548 " single-debian-patch\n"
554 #: ../dgit-maint-merge.7.pod:294
556 "You don't need to create this file if you are using the version 1.0 source "
561 #: ../dgit-maint-merge.7.pod:297
562 msgid "Sample text for debian/source/patch-header"
566 #: ../dgit-maint-merge.7.pod:299
568 "It is a good idea to explain how a user can obtain a breakdown of the "
569 "changes to the upstream source:"
573 #: ../dgit-maint-merge.7.pod:304
575 "The Debian packaging of foo is maintained in git, using the merging workflow "
576 "described in dgit-maint-merge(7). There isn't a patch queue that can be "
577 "represented as a quilt series."
581 #: ../dgit-maint-merge.7.pod:308
583 "A detailed breakdown of the changes is available from their canonical "
584 "representation - git commits in the packaging repository. For example, to "
585 "see the changes made by the Debian maintainer in the first upload of "
586 "upstream version 1.2.3, you could use:"
590 #: ../dgit-maint-merge.7.pod:316
593 " % git clone https://git.dgit.debian.org/foo\n"
595 " % git log --oneline 1.2.3..debian/1.2.3-1 -- . ':!debian'\n"
600 #: ../dgit-maint-merge.7.pod:322
602 "(If you have dgit, use `dgit clone foo`, rather than plain `git clone`.)"
606 #: ../dgit-maint-merge.7.pod:325
607 msgid "A single combined diff, containing all the changes, follows."
611 #: ../dgit-maint-merge.7.pod:329
613 "If you are using the version 1.0 source package format, this text should be "
614 "added to README.source instead. The version 1.0 source package format "
615 "ignores debian/source/patch-header."
619 #: ../dgit-maint-merge.7.pod:333
621 "If you're using the version 3.0 (quilt) source package format, you could add "
622 "this text to README.source instead of debian/source/patch-header, but this "
623 "might distract from more important information present in README.source."
627 #: ../dgit-maint-merge.7.pod:338 ../dgit-maint-debrebase.7.pod:472
628 msgid "BUILDING AND UPLOADING"
632 #: ../dgit-maint-merge.7.pod:340
634 "Use B<dgit build>, B<dgit sbuild>, B<dgit pbuilder>, B<dgit cowbuilder>, "
635 "B<dgit push-source>, and B<dgit push> as detailed in dgit(1). If any "
636 "command fails, dgit will provide a carefully-worded error message explaining "
637 "what you should do. If it's not clear, file a bug against dgit. Remember "
638 "to pass I<--new> for the first upload."
642 #: ../dgit-maint-merge.7.pod:346
644 "As an alternative to B<dgit build> and friends, you can use a tool like "
645 "gitpkg(1). This works because like dgit, gitpkg(1) enforces that HEAD has "
646 "exactly the contents of the source package. gitpkg(1) is highly "
647 "configurable, and one dgit user reports using it to produce and test "
648 "multiple source packages, from different branches corresponding to each of "
649 "the current Debian suites."
653 #: ../dgit-maint-merge.7.pod:353
655 "If you want to skip dgit's checks while iterating on a problem with the "
656 "package build (for example, you don't want to commit your changes to git), "
657 "you can just run dpkg-buildpackage(1) or debuild(1) instead."
661 #: ../dgit-maint-merge.7.pod:357
662 msgid "NEW UPSTREAM RELEASES"
666 #: ../dgit-maint-merge.7.pod:359 ../dgit-maint-debrebase.7.pod:350
667 msgid "Obtaining the release"
671 #: ../dgit-maint-merge.7.pod:365 ../dgit-maint-debrebase.7.pod:356
674 " % git fetch --tags upstream\n"
679 #: ../dgit-maint-merge.7.pod:369 ../dgit-maint-debrebase.7.pod:360
681 "If you want to package an untagged upstream commit (because upstream does "
682 "not tag releases or because you want to package an upstream development "
683 "snapshot), see \"Using untagged upstream commits\" above."
687 #: ../dgit-maint-merge.7.pod:375 ../dgit-maint-debrebase.7.pod:366
689 "You will need the I<debian/gbp.conf> from \"When upstream releases only "
690 "tarballs\", above. You will also need your upstream branch. Above, we "
691 "pushed this to B<salsa.debian.org>. You will need to clone or fetch from "
692 "there, instead of relying on B<dgit clone>/B<dgit fetch> alone."
696 #: ../dgit-maint-merge.7.pod:380 ../dgit-maint-debrebase.7.pod:371
701 #: ../dgit-maint-merge.7.pod:384 ../dgit-maint-debrebase.7.pod:375
704 " % gbp import-orig --no-merge ../foo_1.2.3.orig.tar.xz\n"
709 #: ../dgit-maint-merge.7.pod:388 ../dgit-maint-debrebase.7.pod:379
710 msgid "or if you have a working watch file"
714 #: ../dgit-maint-merge.7.pod:392 ../dgit-maint-debrebase.7.pod:383
717 " % gbp import-orig --no-merge --uscan\n"
722 #: ../dgit-maint-merge.7.pod:396
723 msgid "Reviewing & merging the release"
727 #: ../dgit-maint-merge.7.pod:398
729 "It's a good idea to preview the merge of the new upstream release. First, "
730 "just check for any new or deleted files that may need accounting for in your "
735 #: ../dgit-maint-merge.7.pod:404
738 " % git diff --name-status --diff-filter=ADR master..1.2.3 -- . ':!debian'\n"
743 #: ../dgit-maint-merge.7.pod:408
744 msgid "You can then review the full merge diff:"
748 #: ../dgit-maint-merge.7.pod:412
751 " % git merge-tree `git merge-base master 1.2.3` master 1.2.3 | $PAGER\n"
756 #: ../dgit-maint-merge.7.pod:416
757 msgid "Once you're satisfied with what will be merged, update your package:"
761 #: ../dgit-maint-merge.7.pod:420
764 " % git merge 1.2.3\n"
765 " % dch -v1.2.3-1 New upstream release.\n"
766 " % git add debian/changelog && git commit -m changelog\n"
771 #: ../dgit-maint-merge.7.pod:426 ../dgit-maint-debrebase.7.pod:413
773 "If you obtained a tarball from upstream, you are ready to try a build. If "
774 "you merged a git tag from upstream, you will first need to generate a "
779 #: ../dgit-maint-merge.7.pod:436 ../dgit-maint-debrebase.7.pod:503
780 msgid "HANDLING DFSG-NON-FREE MATERIAL"
784 #: ../dgit-maint-merge.7.pod:440
785 msgid "We create a DFSG-clean tag to merge to master:"
789 #: ../dgit-maint-merge.7.pod:444
792 " % git checkout -b pre-dfsg 1.2.3\n"
793 " % git rm evil.bin\n"
794 " % git commit -m \"upstream version 1.2.3 DFSG-cleaned\"\n"
795 " % git tag -s 1.2.3+dfsg\n"
796 " % git checkout master\n"
797 " % git branch -D pre-dfsg\n"
802 #: ../dgit-maint-merge.7.pod:453
804 "Before merging the new 1.2.3+dfsg tag to master, you should first determine "
805 "whether it would be legally dangerous for the non-free material to be "
806 "publicly accessible in the git history on B<dgit-repos>."
810 #: ../dgit-maint-merge.7.pod:458
812 "If it would be dangerous, there is a big problem; in this case please "
813 "consult your archive administrators (for Debian this is the dgit "
814 "administrator dgit-owner@debian.org and the ftpmasters ftpmaster@ftp-master."
819 #: ../dgit-maint-merge.7.pod:465 ../dgit-maint-debrebase.7.pod:577
821 "The easiest way to handle this is to add a B<Files-Excluded> field to "
822 "I<debian/copyright>, and a B<uversionmangle> setting in I<debian/watch>. "
823 "See uscan(1). Alternatively, see the I<--filter> option detailed in gbp-"
828 #: ../dgit-maint-merge.7.pod:470
829 msgid "FORWARDING PATCHES UPSTREAM"
833 #: ../dgit-maint-merge.7.pod:472
834 msgid "The basic steps are:"
838 #: ../dgit-maint-merge.7.pod:478
839 msgid "Create a new branch based off upstream's master branch."
843 #: ../dgit-maint-merge.7.pod:482
845 "git-cherry-pick(1) commits from your master branch onto your new branch."
849 #: ../dgit-maint-merge.7.pod:487
851 "Push the branch somewhere and ask upstream to merge it, or use git-format-"
852 "patch(1) or git-request-pull(1)."
856 #: ../dgit-maint-merge.7.pod:492
857 msgid "For example (and it is only an example):"
861 #: ../dgit-maint-merge.7.pod:496
864 " % # fork foo.git on GitHub\n"
865 " % git remote add -f fork git@github.com:spwhitton/foo.git\n"
866 " % git checkout -b fix-error upstream/master\n"
867 " % git config branch.fix-error.pushRemote fork\n"
868 " % git cherry-pick master^2\n"
870 " % # submit pull request on GitHub\n"
875 #: ../dgit-maint-merge.7.pod:506
877 "Note that when you merge an upstream release containing your forwarded "
878 "patches, git and dgit will transparently handle \"dropping\" the patches "
879 "that have been forwarded, \"retaining\" the ones that haven't."
883 #: ../dgit-maint-merge.7.pod:510 ../dgit-maint-gbp.7.pod:130
884 #: ../dgit-maint-debrebase.7.pod:582
885 msgid "INCORPORATING NMUS"
889 #: ../dgit-maint-merge.7.pod:518
891 "Alternatively, you can apply the NMU diff to your repository. The next push "
892 "will then require I<--overwrite>."
896 #: ../dgit-maint-merge.7.pod:525 ../dgit-maint-gbp.7.pod:140
897 #: ../dgit-maint-debrebase.7.pod:782 ../dgit-maint-bpo.7.pod:138
898 #: ../git-debpush.1.pod:259
903 #: ../dgit-maint-merge.7.pod:527 ../dgit-maint-debrebase.7.pod:784
905 "This tutorial was written and is maintained by Sean Whitton "
906 "<spwhitton@spwhitton.name>. It contains contributions from other dgit "
907 "contributors too - see the dgit copyright file."