X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=git-debrebase;h=c463f4ace5e2c5ba319d815291b922ce0780e540;hp=72c6f3ad1cf472f809b38c0fca1eb89ec7bbc201;hb=892352e386b2908574d660df3ee778171f59995b;hpb=0323a891b385296fd346dd1ea794c5c2ee8229a0

diff --git a/git-debrebase b/git-debrebase
index 72c6f3ad..c463f4ac 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -344,11 +344,11 @@ sub gbp_pq_export ($$$) {
 }
 
 
-# xxx allow merge separately from laundering
+# xxx allow merge resolution separately from laundering, before git merge
 #
-# xxx docs highlight forbidden things
-# xxx docs list allowable things ?
-# xxx docs explicitly forbid some rebase
+# 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)