summaryrefslogtreecommitdiff
path: root/dgit-maint-merge.7.pod
Commit message (Collapse)AuthorAge
* dgit-maint-merge(7): Configure --merge-mode for gbp-import-orig(1)Sean Whitton2018-01-06
| | | | | | | | | | | | | | For 3.0 (quilt) source packages, gbp-import-orig(1) defaults to --merge-mode=replace, which does the wrong thing for patches-applied repositories (see gbp-import-orig(1)). Note that we do override this when importing the first upstream version. This is needed because git-merge(1) will refuse to merge unrelated histories. Thanks to Johannes Schauer for reporting the problem. Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* dgit-maint-merge(7): Create an empty branch for upstream sourceSean Whitton2018-01-06
| | | | | | Thanks to Johannes Schauer for finding the problem. Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* dgit: dpkg_source_ignores: Exclude the right set of thingsIan Jackson2017-08-04
| | | | | | | | | Change the dpkg-source -i argument to exclude exactly the right set of things. (Sadly this is not a simple rune.) Previously we might exclude `foo.git', for example ! Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: dpkgsourceignores-docs: Check dgit-maint-merge(7) -i -I runeIan Jackson2017-08-04
| | | | | | Check that the rune we document is the same as dgit actually uses. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit-maint-merge(7): Add ' ' around -i\.git/Ian Jackson2017-08-04
| | | | | | | | | | This manpage should present a shell rune, not a half-quoted thing whose interpretation is left as a tricky exercise to othe reader. The ' ' protect the \ so that it would actually get passed to dpkg-buildpackage. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit-maint-merge(7): Reformat slightlyIan Jackson2017-08-04
| | | | | | | Introduce semantic newlines around the dpg-buildpackage -i -I rune. This will make it easier to test. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit-maint-merge(7): Quote sample clone commandsSean Whitton2017-01-25
| | | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name> Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit-maint-merge(7): Get git clone url right. Closes:#852609.Ian Jackson2017-01-25
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit-maint-merge(7): updates re #852090: suggestions by SeanIan Jackson2017-01-22
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit-maint-merge(7): updates re #852090: suggestions by meIan Jackson2017-01-22
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit-maint-merge(7): updates re #852090: suggestions by meIan Jackson2017-01-22
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit-maint-merge(7): updates re #852090: suggestions by meIan Jackson2017-01-22
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit-maint-merge(7): Fix a typo `detachs'Ian Jackson2017-01-21
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit-maint-merge(7): Use git-deborig(1)Sean Whitton2017-01-12
| | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* dgit-maint-merge(7): Use debian/source/patch-headerSean Whitton2017-01-09
| | | | | | | Closes:849120 Signed-off-by: Sean Whitton <spwhitton@spwhitton.name> Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit-maint-merge(7): Add upstream remote after dgit cloneSean Whitton2016-12-19
| | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* dgit-maint-merge(7): Missing 'first'Sean Whitton2016-12-19
| | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* dgit-maint-merge(7): Add upstream remote when convertingSean Whitton2016-12-19
| | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* dgit-maint-merge(7): After converting, need --overwriteSean Whitton2016-12-19
| | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* 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>