summaryrefslogtreecommitdiff
path: root/dgit-maint-merge.7.pod
Commit message (Collapse)AuthorAge
* dgit-maint-merge(7): Converting existing packagesSean Whitton2016-12-19
| | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* dgit-maint-merge(7): Missing -oSean Whitton2016-12-19
| | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* dgit-maint-merge(7): Drop subpoint about "nonlinear histories"Ian Jackson2016-10-31
| | | | | | Suggested by Sean Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit-maint-merge(7): Do not cross-reference nonexistent dgit-maint-rebase(7)Ian Jackson2016-10-31
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit-maint-merge(7): Add paragraph splitIan Jackson2016-10-21
| | | | | Suggested-by: Sean Whitton <spwhitton@spwhitton.name> Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit-maint-merge(7): Move remarks on upstream origSean Whitton2016-10-20
| | | | | | See discussion in #840153. Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* dgit-maint-merge(7): Tweak wordingSean Whitton2016-10-20
| | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* dgit-maint-merge(7): Fiercer instructions about legally dangerous git historyIan Jackson2016-10-20
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit-maint-merge(7): Fix a typo "upsteram"Ian Jackson2016-10-20
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit-maint-merge(7): Mention what to do if upstream make good tarballsIan Jackson2016-10-20
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Manpages: Add note about other contributors to dgit-maint-merge(7)Ian Jackson2016-10-20
| | | | | | | I am going to edit this manpage myself in a moment. In general we don't want to have to update the AUTHOR section manually. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Manpage: add dgit-maint-merge.7.podSean Whitton2016-10-20
Signed-off-by: Sean Whitton <spwhitton@spwhitton.name> Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>