summaryrefslogtreecommitdiff
path: root/dgit-maint-debrebase.7.pod
Commit message (Collapse)AuthorAge
* dgit-maint-*(7): Advice for git-debpush usersSean Whitton2021-02-12
| | | | | | | | | | | | | dgit-maint-native(7) doesn't need updating because git-debpush(1) is clear that quilt mode options are required only for non-native packages. This commit leaves `dgit push{,-source}` as the first choice, with git-debpush(1) given as an alternative. We might want to change that in the future, but for the time being this makes sense. Closes: #932520 Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* dgit-maint-debrebase(7): Drop bad advice about upstream/ tag caseSean Whitton2020-05-27
| | | | | | | | | | | | | The first argument to the new-upstream subcommand is a version number, not a tag name, so this instruction could never have been correct. The user should not need usually to pass both the upstream version number and the upstream/ tag name, either, because git-debrebase should find it for them. Reported-by: David Bremner <bremner@debian.org> Signed-off-by: Sean Whitton <spwhitton@spwhitton.name> Acked-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit-maint-debrebase(7): Import tarball before committing gbp.confSean Whitton2020-02-02
| | | | | | | | | | | The workflow given previously fails to produce a history that can work with git-debrebase, because it has the first commit introducing debian/ be an ancestor of the first import of the upstream source. This is the final part of #932954. Closes: #932954. Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* d-m-{merge,debrebase}(7): Set 'merge' in gbp.confSean Whitton2020-02-02
| | | | | | | | | | | | This enables simplifying runes which are more frequently to be typed. 'merge-mode' no longer need be set since in the only case where the manpages recommend allowing `gbp import-orig` to perform a merge, a different merge mode is required (and specified in that rune). This is part of #932954. Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* d-m-{merge,debrebase}(7): Use an 'upstream/' tag prefix in gbp.confSean Whitton2020-02-02
| | | | | | | | | | | | | This is a useful convention to distinguish actual upstream tags from upstream tarball-representing tags created by the Debian package maintainer. Note that use of this convention is already recommended in section "Using untagged upstream commits". This is part of #932954. Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* dgit-maint-{merge,debrebase}(7): Use git fetch --tags upstreamSean Whitton2019-09-08
| | | | | | | | | We recommend using a remote called 'upstream' and so we can recommend a command which will be faster and less likely to error out. Closes: #939679 Suggested-by: Ian Jackson <ijackson@chiark.greenend.org.uk> Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* dgit-maint-{merge,debrebase}(7): Use git fetch --all --tagsSean Whitton2019-09-05
| | | | | | | | | | | | | | | `git remote update` doesn't fetch tags unless remote branches include the commits at which those tags point. Thus, if upstream pushes their release tag but fails to push their master branch, `git remote update` will not fetch the release tag. I've been in this situation more than once when following the workflows detailed in these manpages, so let's just recommend a command which will definitely try to fetch the latest release tag. Closes: #939504 Signed-off-by: Sean Whitton <spwhitton@spwhitton.name> Acked-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit-maint-{merge,debrebase}(7): Using untagged upstream commitsSean Whitton2019-07-01
| | | | | Closes: #930964 Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* dgit-maint-debrebase(7): Minor wording change apropos of #930956Ian Jackson2019-07-01
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit-maint-{merge,debrebase}(7): Suggest --name-status --diff-filterSean Whitton2019-07-01
| | | | | | | | This is better than just --stat for finding new and deleted files in a new upstream release, which may need accounting for in d/copyright. Closes: #930956 Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* documentation: typo suggestions from Paul HardyPaul Hardy2019-03-01
| | | | Signed-off-by: Paul Hardy <unifoundry@gmail.com>
* dgit-maint-debrebase(7): handle DFSG-filtering for a new packageSean Whitton2019-01-05
| | | | | Closes: #915973 Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* dgit-maint-debrebase(7): Minor corrections to #903377 wordingIan Jackson2018-11-08
| | | | | | | | | | | Do not suggest trying without --overwrite first, since if you were going to pass it anyway you may as well do so right away. And mention that git-debrebase will normally prompt you to say dgit --overwrite. Closes: #903377 Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit-maint-debrebase(7): account for case discussed in #903377Sean Whitton2018-11-08
| | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* dgit-maint-debrebase(7): Formatting & wording tweaksSean Whitton2018-08-26
| | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* dgit-maint-debrebase(7): Avoid some uses of =itemSean Whitton2018-08-26
| | | | | | | | Commands for the user to type into their shell should have empty lines above and below them; this ensures that. Admittedly while making the POD source harder to read. Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* dgit-maint-debrebase(7): demote "Inspecting the history"Sean Whitton2018-08-26
| | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* dgit-maint-debrebase(7): Add runes for inspecting historyIan Jackson2018-08-26
| | | | | | | | | I'm not sure if this is the right place but I wanted to publish this information sooner rather than later. Closes: #907190. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit-maint-debrebase(7): Add crossreference to "ILLEGAL OPERATIONS"Sean Whitton2018-08-21
| | | | | | | | | | | | | There are three items under "ILLEGAL OPERATIONS": 1. We already refer to "OTHER MERGES". 2. This commit adds a crossreference to the second item. 3. The information under "Editing debian/patches" is already basically included in dgit-maint-debrebase(7). Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* dgit-maint-debrebase(7): Rewrite "Converting an existing package"Sean Whitton2018-08-21
| | | | | | Closes:#905573 Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* dgit-maint-debrebase(7): Warn more against plain git rebase.Ian Jackson2018-07-31
| | | | | | | | | | | Specifically, - warn that pseudomerges must not be rebased over - warn and that git-rebase without a base should not be used - say to run gdr instead Closes:#905004. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit-maint-debrebase(7): fix command to just launderSean Whitton2018-07-29
| | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* manpages: add references to pbuilder and cowbuilderSean Whitton2018-07-29
| | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* git-debrebase: Rename new-upstream-v0 command to new-upstreamIan Jackson2018-06-17
| | | | | | | | | | This UI is pretty good now, I think, for single-piece upstreams. For multi-piece ones, which are quite tricky anyway, it is tolerable, and we it doesn't steal much of the available syntax space. So we don't need the -v0 any more. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit-maint-debrebase(7): Add cross-refs to git-debrebase(1) and (5)Ian Jackson2018-06-17
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit-maint-debrebase(7): rewrite "Upstream branches" againSean Whitton2018-04-19
| | | | | Suggested-by: Ian Jackson <ijackson@chiark.greenend.org.uk> Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* dgit-maint-debrebase(7): tweak instructions to import DFSG-clean tagSean Whitton2018-04-19
| | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* dgit-maint-debrebase(7): add another "# if needed"Sean Whitton2018-04-19
| | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* dgit-maint-debrebase(7): be consistent about referring to the toolSean Whitton2018-04-19
| | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* dgit-maint-debrebase(7): downgrade very minimal debrebasing workflow yet furtherSean Whitton2018-04-19
| | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* dgit-maint-debrebase(7): improve "Upstream branches"Sean Whitton2018-04-19
| | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* dgit-maint-debrebase(7): further notes about d/patchesSean Whitton2018-04-19
| | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* dgit-maint-debrebase(7): respond to feedback on DFSG-non-free sectionSean Whitton2018-04-19
| | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* dgit-maint-debrebase(7): notes about d/patchesSean Whitton2018-04-19
| | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* dgit-maint-debrebase(7): improve advice about minimising stitchesSean Whitton2018-04-19
| | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* dgit-maint-debrebase(7): correct what debrebase will do when debrebasing an NMUSean Whitton2018-04-19
| | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* dgit-maint-debrebase(7): drop claims about purpose of branchesSean Whitton2018-04-19
| | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* dgit-maint-debrebase(7): simplify hint about manual rebaseSean Whitton2018-04-19
| | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* dgit-maint-debrebase(7): fix debrebase invocationsSean Whitton2018-04-19
| | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* dgit-maint-debrebase(7): add "EDITING THE DEBIAN PACKAGING"Sean Whitton2018-04-19
| | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* dgit-maint-debrebase(7): fix desc. of convert-from-gbp cmdSean Whitton2018-04-19
| | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* dgit-maint-debrebase(7): respond to feedbackSean Whitton2018-04-19
| | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* dgit-maint-debrebase(7): Verifying->ComparingSean Whitton2018-04-19
| | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* dgit-maint-debrebase(7): first commit to new package must introduce debian/ ↵Sean Whitton2018-04-19
| | | | | | and nothing else Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* dgit-maint-debrebase(7): make the wood visible despite the treesSean Whitton2018-04-19
| | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* dgit-maint-debrebase(7): it's an exampleSean Whitton2018-04-19
| | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* dgit-maint-debrebase(7): avoiding mergesSean Whitton2018-04-19
| | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* dgit-maint-debrebase(7): fix NMUs sectionSean Whitton2018-04-19
| | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* dgit-maint-debrebase(7): patch queue -> delta queueSean Whitton2018-04-19
| | | | | | For consistency with git-debrebase(5). Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* dgit-maint-debrebase(7): add another advantageSean Whitton2018-04-19
| | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-28 09:49:46 +0000