X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=git-debrebase;h=6655b2d200dde46f1c997866abe1713389daa51f;hb=ac7dbb8eca4e6996bb06f175a4df6e7c0c2a19f8;hp=a9f510c8f112327b41b19adefcaff4060491be6b;hpb=f8ea491fa27e80e4f2fac287d01071b8b27861cc;p=dgit.git diff --git a/git-debrebase b/git-debrebase index a9f510c8..6655b2d2 100755 --- a/git-debrebase +++ b/git-debrebase @@ -88,7 +88,7 @@ use Data::Dumper; use Getopt::Long qw(:config posix_default gnu_compat bundling); use Dpkg::Version; -our ($opt_force); +our ($opt_force, $opt_noop_ok); our $us = qw(git-debrebase); @@ -1140,6 +1140,7 @@ sub cmd_downstream_rebase_launder_v0 () { } GetOptions("D+" => \$debuglevel, + 'noop-ok', => \$opt_noop_ok, 'f=s' => \@fproblem_force_opts, 'force!') or die badusage "bad options\n"; initdebug('git-debrebase ');