index
:
dgit
master
Debian dgit repo for package dgit
summary
refs
log
tree
commit
diff
log msg
author
committer
range
path:
root
/
tests
/
tests
/
gdr-merge-conflicts
Commit message (
Expand
)
Author
Age
*
git-debrebase: gdr-merge-conflicts: Call git merge --no-edit
Ian Jackson
2018-08-26
*
test suite: Fix dependencies of new gdr-merge-conflicts test.
debian/6.8
archive/debian/6.8
Ian Jackson
2018-08-20
*
git-debrebase: Merges: Enable with command-line option instead of env var
Ian Jackson
2018-08-19
*
git-debrebase: merge: test conflict: Test resolution via patch
Ian Jackson
2018-08-12
*
git-debrebase: merge: Actually record merge resolutions
Ian Jackson
2018-08-12
*
git-debrebase: merge: test conflict: Break out no-wreckage
Ian Jackson
2018-08-12
*
git-debrebase: merge: Change wreckage to refs/debrebase/wreckage/*
Ian Jackson
2018-08-12
*
git-debrebase: merge: New record-resolved-merge subcommand, WIP
Ian Jackson
2018-08-12
*
git-debrebase: merge: test gdr-merge-conflicts: Test late wreckage
Ian Jackson
2018-08-11
*
git-debrebase: merge: test gdr-merge-conflicts: Break out wreckage-*
Ian Jackson
2018-08-11
*
git-debrebase: merge: Always save wreckage
Ian Jackson
2018-08-11
*
git-debrebase: merge: test suite: Drop check of no wreckage save
Ian Jackson
2018-08-11
*
git-debrebase: merge: test suite: Check wreckage tidying
Ian Jackson
2018-08-11
*
git-debrebase: merge: test suite: Check wreckage saving
Ian Jackson
2018-08-11
*
git-debrebase: merge: gdr-merge test: Test an early failure too
Ian Jackson
2018-08-11
*
git-debrebase: merge: gdr-merge-conflicts test: New test
Ian Jackson
2018-08-11