summaryrefslogtreecommitdiff
path: root/git-debrebase
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2018-08-11 11:42:53 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2018-08-11 11:42:53 +0100
commit892352e386b2908574d660df3ee778171f59995b (patch)
tree307993c8b03fcd155f7f156a4f19fc872607c0ff /git-debrebase
parent0323a891b385296fd346dd1ea794c5c2ee8229a0 (diff)
git-debrebase: merge: Improve some xxx comments
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'git-debrebase')
-rwxr-xr-xgit-debrebase8
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)