chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
git-debrebase: wip stitch
[dgit.git]
/
tests
/
tests
/
gdr-edits
diff --git
a/tests/tests/gdr-edits
b/tests/tests/gdr-edits
index 1d74da3b54d1961983bdd06322cead0ebd6ae420..8bfbfc61b2ddadca5c5afbc56328aff3ec840bb0 100755
(executable)
--- a/
tests/tests/gdr-edits
+++ b/
tests/tests/gdr-edits
@@
-24,4
+24,12
@@
for f in debian/zorkmid src.c; do
done
git commit -m 'MIXED add boths'
+git tag t.before
+
+t-git-debrebase
+
+git diff t.before -- ':.' ':!debian/patches'
+
+t-git-debrebase stitch --prose=wombat
+
t-ok