diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-04-22 16:38:51 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-06-16 16:07:01 +0100 |
commit | deb725236dab7d80249e72e871d069be25a607f8 (patch) | |
tree | fc40faf1d53ca3bf3af811e4135546cad5e816e4 /git-debrebase.1.pod | |
parent | f58777f379b8fea92d8ae4f80c1bba3299d951b3 (diff) |
git-debrebase: Handle -i option as a git-rebase option
Ie, as a request to do a rebase.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'git-debrebase.1.pod')
-rw-r--r-- | git-debrebase.1.pod | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/git-debrebase.1.pod b/git-debrebase.1.pod index 8f092c8..bdec02f 100644 --- a/git-debrebase.1.pod +++ b/git-debrebase.1.pod @@ -29,10 +29,13 @@ which defines many important terms used here. =item git-debrebase [-- <git-rebase options...>] +=item git-debrebase [-i <further git-rebase options...>] + Unstitches and launders the branch. (See L</UNSTITCHING AND LAUNDERING> below.) -Then optionally edits the Debian delta queue, +Then, if any git-rebase options were supplied, +edits the Debian delta queue, using git-rebase, by running git rebase <git-rebase options> <breakwater-tip> @@ -48,6 +51,10 @@ If you abort the git-rebase, the branch will still have been laundered, but everything in the rebase will be undone. +The options for git-rebase must either start with C<-i>, +or be prececded by C<-->, +to distinguish them from options for git-debrebase. + =item git-debrebase conclude Launder and restitch the branch, |