diff options
authorIan Jackson <>2018-08-19 20:25:16 +0100
committerIan Jackson <>2018-08-19 21:00:31 +0100
commit6392501bee3f167ca61ba648413190ac83cf4257 (patch)
parentdea27c626d6c39d11a1b591005fd2e6e2a17e295 (diff)
git-debrebase: Merge: Remove some xxx's
git-debrebase(5) already has ILLEGAL OPERATIONS (which forbids many git-rebase operations) and also of course LEGAL OPERATIONS. The limitations on what kind of merges we can resolve and how will be documented when we document the merge machinery properly. Signed-off-by: Ian Jackson <>
1 files changed, 0 insertions, 4 deletions
diff --git a/git-debrebase b/git-debrebase
index 42e8f7e..3693190 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -447,10 +447,6 @@ sub gbp_pq_export ($$$) {
# xxx allow merge resolution separately from laundering, before git merge
-# xxx general gdr docs highlight forbidden things
-# xxx general gdr docs list allowable things ?
-# xxx general gdr docs explicitly forbid some rebase
# later/rework?
# use git-format-patch?