chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅ next
test suite: tagupl: Check Source mismatch
[dgit.git]
/
tests
/
tests
/
gdr-merge-conflicts
2018-08-26
Ian Jackson
git-debrebase: gdr-merge-conflicts: Call git merge...
blob
|
commitdiff
|
raw
2018-08-20
Ian Jackson
test suite: Fix dependencies of new gdr-merge-conflicts...
archive/debian/6.8
debian/6.8
blob
|
commitdiff
|
raw
|
diff to current
2018-08-19
Ian Jackson
git-debrebase: Merges: Enable with command-line option...
blob
|
commitdiff
|
raw
|
diff to current
2018-08-12
Ian Jackson
git-debrebase: merge: test conflict: Test resolution...
blob
|
commitdiff
|
raw
|
diff to current
2018-08-12
Ian Jackson
git-debrebase: merge: Actually record merge resolutions
blob
|
commitdiff
|
raw
|
diff to current
2018-08-12
Ian Jackson
git-debrebase: merge: test conflict: Break out no-wreckage
blob
|
commitdiff
|
raw
|
diff to current
2018-08-12
Ian Jackson
git-debrebase: merge: Change wreckage to refs/debrebase...
blob
|
commitdiff
|
raw
|
diff to current
2018-08-12
Ian Jackson
git-debrebase: merge: New record-resolved-merge subcomm...
blob
|
commitdiff
|
raw
|
diff to current
2018-08-11
Ian Jackson
git-debrebase: merge: test gdr-merge-conflicts: Test...
blob
|
commitdiff
|
raw
|
diff to current
2018-08-11
Ian Jackson
git-debrebase: merge: test gdr-merge-conflicts: Break...
blob
|
commitdiff
|
raw
|
diff to current
2018-08-11
Ian Jackson
git-debrebase: merge: Always save wreckage
blob
|
commitdiff
|
raw
|
diff to current
2018-08-11
Ian Jackson
git-debrebase: merge: test suite: Drop check of no...
blob
|
commitdiff
|
raw
|
diff to current
2018-08-11
Ian Jackson
git-debrebase: merge: test suite: Check wreckage tidying
blob
|
commitdiff
|
raw
|
diff to current
2018-08-11
Ian Jackson
git-debrebase: merge: test suite: Check wreckage saving
blob
|
commitdiff
|
raw
|
diff to current
2018-08-11
Ian Jackson
git-debrebase: merge: gdr-merge test: Test an early...
blob
|
commitdiff
|
raw
|
diff to current
2018-08-11
Ian Jackson
git-debrebase: merge: gdr-merge-conflicts test: New...
blob
|
commitdiff
|
raw
|
diff to current