summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--NOTES.git-debrebase1
-rwxr-xr-xgit-debrebase6
2 files changed, 7 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)+)\]}
diff --git a/git-debrebase b/git-debrebase
index 592dd29..19beef8 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -832,6 +832,12 @@ sub cmd_launder () {
sub defaultcmd_rebase () {
my $old = get_head();
+ my ($status, $message) = record_ffq_prev();
+ if ($status eq 'written' || $status eq 'exists') {
+ } else {
+ fproblem $status, "could not record ffq-prev: $message";
+ fproblems_maybe_bail();
+ }
my ($tip,$breakwater) = walk $old;
update_head_postlaunder $old, $tip, 'launder for rebase';
runcmd @git, qw(rebase), @ARGV, $breakwater;