From e2ef34589c5758d96f492bec534eb9b3398fa960 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 11 Aug 2018 22:57:23 +0100 Subject: git-debrebase: merge: conflict: Some xxx's now done Signed-off-by: Ian Jackson --- git-debrebase | 3 --- 1 file changed, 3 deletions(-) diff --git a/git-debrebase b/git-debrebase index f9b6254..41373f3 100755 --- a/git-debrebase +++ b/git-debrebase @@ -373,9 +373,6 @@ sub gbp_pq_export ($$$) { # xxx general gdr docs highlight forbidden things # xxx general gdr docs list allowable things ? # xxx general gdr docs explicitly forbid some rebase -# -# xxx provide a way for the user to help -# xxx (eg, provide wreckage provide way to continue) # later/rework? # use git-format-patch? -- cgit v1.2.3