From e66c2cf3f7182a3e6f52945636a807ed4a959d5b Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 19 Aug 2018 18:41:40 +0100 Subject: git-debrebase: `prepush' is now a silent no-op if unstitched. This is more friendly. Update the docs accordingly. Signed-off-by: Ian Jackson --- git-debrebase.1.pod | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'git-debrebase.1.pod') diff --git a/git-debrebase.1.pod b/git-debrebase.1.pod index fe65674..ca81c19 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=] +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 instead, +because that launders the branch too. + =item git-debrebase stitch [--prose=] 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 instead, -because that launders the branch too. +You should consider using B or B instead. =item git-debrebase scrap -- cgit v1.2.3 From 7bc6dfb448ed6279adb7a3eafa3dcc86a2c111b5 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 19 Aug 2018 20:44:29 +0100 Subject: git-debrebase: Merges: Enable with command-line option instead of env var Signed-off-by: Ian Jackson --- git-debrebase.1.pod | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'git-debrebase.1.pod') diff --git a/git-debrebase.1.pod b/git-debrebase.1.pod index ca81c19..7ad1ab9 100644 --- a/git-debrebase.1.pod +++ b/git-debrebase.1.pod @@ -496,6 +496,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). + +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 -- cgit v1.2.3 From 45abe880e0efbdc3834168f4fd384678e1c30a51 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Fri, 24 Aug 2018 21:31:49 +0100 Subject: git-debrebase: forget-was-ever-debrebase: New subcommand Signed-off-by: Ian Jackson --- git-debrebase.1.pod | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'git-debrebase.1.pod') diff --git a/git-debrebase.1.pod b/git-debrebase.1.pod index 7ad1ab9..1156825 100644 --- a/git-debrebase.1.pod +++ b/git-debrebase.1.pod @@ -422,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 -- cgit v1.2.3