diff options
| author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2017-02-08 23:33:06 +0000 |
|---|---|---|
| committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-06-16 12:25:49 +0100 |
| commit | f3bb0b33b8b467dd0a03549fdb32d0e3ce7d8e6a (patch) | |
| tree | 21268c42d4f3a0a09a6ded503711b14feeb13417 | |
| parent | 6626312b0f14d984d529557b47df076800452a18 (diff) | |
git-debrebase: WIP command line comments
| -rwxr-xr-x | git-debrebase | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/git-debrebase b/git-debrebase index ddfff48..f740ed0 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 |