chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
test suite: note some todos for gdr-edits
[dgit.git]
/
NOTES.git-debrebase
diff --git
a/NOTES.git-debrebase
b/NOTES.git-debrebase
index 8aed2ff28887803b6481e75e4a2997ca59221a65..32f9b494869a6665d66d6aa9601d6f908e4e1ac0 100644
(file)
--- a/
NOTES.git-debrebase
+++ b/
NOTES.git-debrebase
@@
-42,6
+42,7
@@
overall format
[git-debrebase: gbp2debrebase, drop patches]
[git-debrebase breakwater: declare upstream]
+[git-debrebase pseudomerge: stitch]
m{^\[git-debrebase (?:\w*-)?upstream combine \.((?: $extra_orig_namepart_re)+)\]}