diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-04-22 22:28:49 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-06-16 22:40:13 +0100 |
commit | 8b875c05ff728c9335f692ccc21c5abfe2203d26 (patch) | |
tree | fc7903a6a1cfbadc91974747a9c43096e8ab6f06 /git-debrebase.1.pod | |
parent | bdeb85eacfd821cad3e1be0bc844dff5671389b7 (diff) |
git-debrebase: Provide and test "conclude"
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'git-debrebase.1.pod')
-rw-r--r-- | git-debrebase.1.pod | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/git-debrebase.1.pod b/git-debrebase.1.pod index 68447b9..3e4c698 100644 --- a/git-debrebase.1.pod +++ b/git-debrebase.1.pod @@ -55,6 +55,17 @@ 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 + +Finishes a git-debrebase session, +tidying up the branch and making it fast forward again. + +Specifically: if the branch is unstitched, +launders and restitches it, +making a new pseudomerge. +Otherwise, it is an error, +unless --noop-ok. + =item git-debrebase quick Unconditionally launders and restitches the branch, |