From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 8 Feb 2017 23:33:06 +0000 (+0000)
Subject: git-debrebase: WIP command line comments
X-Git-Tag: archive/debian/5.0~382
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=f3bb0b33b8b467dd0a03549fdb32d0e3ce7d8e6a;p=dgit.git

git-debrebase: WIP command line comments
---

diff --git a/git-debrebase b/git-debrebase
index ddfff481..f740ed05 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -22,9 +22,26 @@
 #    git-debrebase launder     # prints breakwater tip
 #    git-debrebase analyse
 #    git-debrebase start       # like ffrebase start + debrebase launder
-#    git-debrebase new-upstream [-f] UPSTREAM[,...]
+#    git-debrebase create-new-upstream [-f] <upstreaminfo>
+#    git-debrebase new-upstream [-f] <upstreaminfo>
 #    git-debrebase <git-rebase options>  # does debrebase start if necessary
 #
+# <upstreaminfo> is
+#    [,][<subdir>:][+]<commitid>[,...]
+#
+# if initial comma is supplied, entries are not positional.  Unspecified
+# <subdir> means root (and there may be only one).
+# xxx want auto branch names
+# xxx too complicated
+# how about for now
+#    [+]<commit> [<subdir:> [+]<commit>...]
+# ?  plus options
+#     --new-upstream-different-subtrees
+
+#    UPSTREAM[,[[SUBDIR:]SUBUPSTREAM]
+#    default for SUBDIR: is from previous upstream merge[xxx terminology]
+#    
+#
 #xxx
 # when starting must record original start (for ff)
 # and new rebase basis