diff options
Diffstat (limited to 'git-debrebase.1.pod')
| -rw-r--r-- | git-debrebase.1.pod | 40 |
1 files changed, 37 insertions, 3 deletions
diff --git a/git-debrebase.1.pod b/git-debrebase.1.pod index fe65674..1156825 100644 --- a/git-debrebase.1.pod +++ b/git-debrebase.1.pod @@ -95,16 +95,22 @@ If the branch is already laundered and stitched, does nothing. =item git-debrebase prepush [--prose=<for commit message>] +If the branch is unstitched, +stitches it, +consuming ffq-prev. + +This is a good command to run before pushing to a git server. +You should consider using B<conclude> instead, +because that launders the branch too. + =item git-debrebase stitch [--prose=<for commit message>] Stitches the branch, consuming ffq-prev. -This is a good command to run before pushing to a git server. If there is no ffq-prev, it is an error, unless --noop-ok. -You should consider using B<conclude> instead, -because that launders the branch too. +You should consider using B<prepush> or B<conclude> instead. =item git-debrebase scrap @@ -416,6 +422,20 @@ and it should not be necessary. =back +=item git-debrebase forget-was-ever-debrebase + +Deletes the ffq-prev and debrebase-last refs +associated with this branch, +that git-debrebase and dgit use to determine +whether this branch is managed by git-debrebase, +and what previous head may need to be stitched back in. + +This can be useful if you were just playing with git-debrebase, +and have used git-reset --hard to go back to a commit +before your experiments. + +Do not use this if you expect to run git-debrebase on the branch again. + =back =head1 OPTIONS @@ -490,6 +510,20 @@ This is provided mostly for the benefit of the test suite. Requests (more) debugging. May be repeated. +=item --experimntal-merge-resolution + +Enable experimental code for handling general merges +(see L<git-debrebase(5)/General merges>). + +This option may generate branch structures that +require the use of this same option by other people. +Also you may experience lossage of various kinds, +including false error messages, +references to nonexistent documentation, +being handed an incomprehensible pile of +multidimensional merge wreckage, +and/or possible mangling of your package's source code. + =back =head1 UNSTITCHING AND LAUNDERING |