From 892352e386b2908574d660df3ee778171f59995b Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 11 Aug 2018 11:42:53 +0100 Subject: [PATCH] git-debrebase: merge: Improve some xxx comments Signed-off-by: Ian Jackson --- git-debrebase | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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) -- 2.30.2