dgit - Debian dgit repo for package dgit

	Commit message (Collapse)	Author	Age
*	test suite: Test dgit branch_is_gdr walker on a merge resolution	Ian Jackson	2018-08-25
\| \| \| \|	Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
*	git-debrebase: Merges: Enable with command-line option instead of env var	Ian Jackson	2018-08-19
\| \| \| \|	Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
*	git-debrebase: merge: gdr-merge test: sort out section comments	Ian Jackson	2018-08-11
\| \| \| \|	Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
*	git-debrebase: merge: test: Introduce t-merge-conflicted-*	Ian Jackson	2018-08-11
\| \| \| \| \| \|	NFC Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
*	git-debrebase: merge: test: Drop stuff cloned from gdr-viagit	Ian Jackson	2018-08-11
\| \| \| \| \| \|	We don't much are about this here. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
*	git-debrebase: merge: test suite: Use t-ref-same-start	Ian Jackson	2018-08-11
\| \| \| \| \| \| \| \|	This is better than t-gdr-good laundered because (i) it is faster (ii) it checks that the second laundry was a no-op (and did not rewrite unnecessarily). Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
*	git-debrebase: merge: test suite: test avoiding re-merge of debian/	Ian Jackson	2018-08-11
\| \| \| \|	Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
*	git-debrebase: merge: test suite: Do a bit more testing	Ian Jackson	2018-08-11
\| \| \| \| \| \|	We can now call t-gdr-good laundered, because it works. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
*	git-debrebase: merge: Comment about laundry of merge of unstitched	Ian Jackson	2018-08-11
\| \| \| \| \| \| \| \|	I have concluded that this is not a problem avoidable by git-debrebase, and that any trouble will be tolerable (at least, not data loss). The user should try to avoid doing this. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
*	git-debrebase: merge: test suite: Test both with and without `after'	Ian Jackson	2018-08-11
\| \| \| \|	Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
*	git-debrebase: test suite: New gdr-merge test	Ian Jackson	2018-08-11
	This still has a lot of xxx's, but as it is right now it passes, despite all the bugs. This seems like a reasonable baseline for more work. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>