chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
git-debrebase: introduce --noop-ok
[dgit.git]
/
git-debrebase
diff --git
a/git-debrebase
b/git-debrebase
index a9f510c8f112327b41b19adefcaff4060491be6b..6655b2d200dde46f1c997866abe1713389daa51f 100755
(executable)
--- 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;
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);
our $us = qw(git-debrebase);
@@
-1140,6
+1140,7
@@
sub cmd_downstream_rebase_launder_v0 () {
}
GetOptions("D+" => \$debuglevel,
}
GetOptions("D+" => \$debuglevel,
+ 'noop-ok', => \$opt_noop_ok,
'f=s' => \@fproblem_force_opts,
'force!') or die badusage "bad options\n";
initdebug('git-debrebase ');
'f=s' => \@fproblem_force_opts,
'force!') or die badusage "bad options\n";
initdebug('git-debrebase ');