summaryrefslogtreecommitdiff
path: root/dgit-maint-debrebase.7.pod
Commit message (Collapse)AuthorAge
* 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>
* dgit-maint-debrebase(7): begin incorporating feedbackSean Whitton2018-04-19
| | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* dgit-maint-debrebase(7): first draftSean Whitton2018-04-19
Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>