summaryrefslogtreecommitdiff
path: root/NOTES.git-debrebase
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2018-02-15 20:17:12 +0000
committerIan Jackson <ijackson@chiark.greenend.org.uk>2018-06-16 12:25:49 +0100
commit0943c19e7dcccf0ac05fb266b232a9c36781264e (patch)
tree9a44e3d72bd6600612a01963f88d31e56b1daae4 /NOTES.git-debrebase
parenta865af47e6e6dc6160812fa0cdfbcb4d57f38723 (diff)
git-debrebase: record ffq-prev on rebase
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'NOTES.git-debrebase')
-rw-r--r--NOTES.git-debrebase1
1 files changed, 1 insertions, 0 deletions
diff --git a/NOTES.git-debrebase b/NOTES.git-debrebase
index 8aed2ff..32f9b49 100644
--- 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)+)\]}