From 92c9546d19a2e4edf3de98b7487d582237a19ca0 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Mon, 19 Feb 2018 01:38:37 +0000 Subject: git-debrebase(1): document options Signed-off-by: Ian Jackson --- git-debrebase.1.pod | 62 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) diff --git a/git-debrebase.1.pod b/git-debrebase.1.pod index cd52c8c..9ddf939 100644 --- a/git-debrebase.1.pod +++ b/git-debrebase.1.pod @@ -243,6 +243,68 @@ or you will drop all the patches! =back +=head1 OPTIONS + +This section documents the general options +to git-debrebase +(ie, the ones which follow git-debrebase). +Individual operations may have their own options which are +docuented under each operation. + +=over + +=item -f + +Turns problems with id into warnings. + +Some troublesome things which git-debrebase encounters +are Bs. +(The specific instances are discussed +in the text for the relvant operation.) + +When a problem is detected, +a message is printed to stderr containing the problem id +(in the form C<-f>), +along with some prose. + +If problems are detected, git-debrebase does not continue, +unless the relevant -f is specified, +or --force is specified. + +=item --force + +Turns all problems into warnings. +See the -f option. + +Do not invoke git-debrebase --force in scripts and aliases; +instead, specify the particular -f for expected problems. + +=item --noop-ok + +Suppresses the error in +some situations where git-debrebase does nothing, +because there is nothing to do. + +The specific instances are discussed +in the text for the relvant operation. + +=item --anchor= + +Treats as an anchor, +regardless of what it's actually like. + +(It is a problem for +git-debrebase new-upstream operations +if is the previous anchor to be used, +because treating an arbitrary commit as an anchor +means forgoing upstream coherency checks.) + +=item -D + +Requests (more) debugging. May be repeated. + +=back + =head1 UNSTITCHING AND LAUNDERING Several operations unstitch and launder the branch first. -- cgit v1.2.3