chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
971d00a
)
git-debrebase: convert-to-gbp: mention commit tag
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sat, 17 Feb 2018 12:27:29 +0000
(12:27 +0000)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sat, 16 Jun 2018 15:03:12 +0000
(16:03 +0100)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
NOTES.git-debrebase
patch
|
blob
|
history
diff --git
a/NOTES.git-debrebase
b/NOTES.git-debrebase
index a8e16aff41eda9230a57f76f9f39471fdf3acf28..1cfa070b2d2046c3705395687e13825a6524c9ce 100644
(file)
--- a/
NOTES.git-debrebase
+++ b/
NOTES.git-debrebase
@@
-55,6
+55,8
@@
overall format
[git-debrebase breakwater: declare upstream]
[git-debrebase pseudomerge: stitch]
+[git-debrebase convert-to-gbp: commit patches]
+
m{^\[git-debrebase (?:\w*-)?upstream combine \.((?: $extra_orig_namepart_re)+)\]}
Every breakwater commit must be a merge. In principle, this is not