summaryrefslogtreecommitdiff
path: root/git-debrebase
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2018-02-09 21:49:54 +0000
committerIan Jackson <ijackson@chiark.greenend.org.uk>2018-06-16 12:25:49 +0100
commite2ac59451c647d10669a87a5189802f2ab572b7e (patch)
treedcceeb446ef30f8799a0aea1740a364d55a069a4 /git-debrebase
parent257ed0b02dadd4538f515807189acdd95d88c320 (diff)
git-debrebase: some notes about gbp import
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'git-debrebase')
-rwxr-xr-xgit-debrebase7
1 files changed, 5 insertions, 2 deletions
diff --git a/git-debrebase b/git-debrebase
index 85cf331..b57e428 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -22,14 +22,17 @@
# usages:
#
# git-debrebase [<options>] new-upstream-v0 \
-# <new-version> <orig-commitish>
-# [<extra-orig-name> <extra-orig-commitish> ...]
+# <new-version> <orig-commitish> \
+# [<extra-orig-name> <extra-orig-commitish> ...] \
# [<git-rebase options>...]
#
# git-debrebase [<options> --] [<git-rebase options...>]
# git-debrebase [<options>] analyse
# git-debrebase [<options>] launder # prints breakwater tip etc.
# git-debrebase [<options>] downstream-rebase-launder-v0 # experimental
+#
+# git-debrebase [<options>] gbp2debrebase-v0 \
+# <upstream>
# problems / outstanding questions:
#