From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 19 Aug 2018 19:25:16 +0000 (+0100)
Subject: git-debrebase: Merge: Remove some xxx's
X-Git-Tag: archive/debian/6.7~28
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=6392501bee3f167ca61ba648413190ac83cf4257

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 <ijackson@chiark.greenend.org.uk>
---

diff --git a/git-debrebase b/git-debrebase
index 42e8f7e3..36931906 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?