X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=git-debrebase;h=3be444b935e4af4e02a2e50e2e61cbf0230e4b81;hb=d74ea48e54d4bf0902bfe2364cde833d27e40ad8;hp=706af5425130298c9968fa3b298842db0dd6bf4b;hpb=7bc6dfb448ed6279adb7a3eafa3dcc86a2c111b5;p=dgit.git

diff --git a/git-debrebase b/git-debrebase
index 706af542..3be444b9 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -681,6 +681,8 @@ sub merge_series_patchqueue_convert ($$$) {
 	runcmd @git, qw(checkout -q -b mergec), $merged_pq;
 
 	merge_attempt_cmd($wrecknotes, qw(gbp pq import));
+	# MERGE-TODO consider git-format-patch etc. instead,
+	# since gbp pq doesn't always round-trip :-/
 
 	# OK now we are on patch-queue/merge, and we need to rebase
 	# onto the intended parent and drop the patches from each one