From d74ea48e54d4bf0902bfe2364cde833d27e40ad8 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 19 Aug 2018 20:45:19 +0100
Subject: [PATCH 1/1] git-debrebase: Merge: Make a todo about gbp not round
 tripping

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---
 git-debrebase | 2 ++
 1 file changed, 2 insertions(+)

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
-- 
2.30.2