chiark / gitweb /
git-debrebase: WIP command line comments
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Wed, 8 Feb 2017 23:33:06 +0000 (23:33 +0000)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 16 Jun 2018 11:25:49 +0000 (12:25 +0100)
git-debrebase

index ddfff481edac844cccb4e99534ac2b52fe84dbfe..f740ed0520917193c80bdbec9320db8df640f754 100755 (executable)
 #    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