diff options
Diffstat (limited to 'git-debrebase')
| -rwxr-xr-x | git-debrebase | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/git-debrebase b/git-debrebase index 72c6f3a..c463f4a 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) |