diff options
Diffstat (limited to 'dgit-maint-merge.7.pod')
| -rw-r--r-- | dgit-maint-merge.7.pod | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/dgit-maint-merge.7.pod b/dgit-maint-merge.7.pod index b60da85..07fb9a8 100644 --- a/dgit-maint-merge.7.pod +++ b/dgit-maint-merge.7.pod @@ -285,7 +285,7 @@ avoids introducing a new origin commit into your git history. (This origin commit would represent the most recent non-dgit upload of the package, but this should already be represented in your git history.) -=head1 SOURCE PACKAGE AND GIT WORKING TREE CONFIGURATION +=head1 SOURCE PACKAGE AND GIT CONFIGURATION =head2 dgit configuration @@ -298,15 +298,9 @@ a linear queue of patches to the upstream source: =back -This affects only this one git tree; -your other git trees for this package (and co-maintainers) -will need it too. -Don't set it more globally, -because the maintainers of any other packages -you work on, or send patches for, -may be offended by its effects. - -unpleasant NMUs +This command should be executed in each git clone of this package, including +your co-maintainer's. Don't set it more globally, because it is not a good +default for working on Debian source packages in general. =head2 debian/source/options @@ -351,8 +345,6 @@ first upload of upstream version 1.2.3, you could use: (If you have dgit, use `dgit clone foo`, rather than plain `git clone`.) -A single combined diff, containing all the changes, follows. - =back =head1 BUILDING AND UPLOADING |