diff options
Diffstat (limited to 'git-debrebase')
| -rwxr-xr-x | git-debrebase | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/git-debrebase b/git-debrebase index 36f73d7..706af54 100755 --- a/git-debrebase +++ b/git-debrebase @@ -50,7 +50,7 @@ usages: See git-debrebase(1), git-debrebase(5), dgit-maint-debrebase(7) (in dgit). END -our ($opt_force, $opt_noop_ok, @opt_anchors); +our ($opt_force, $opt_noop_ok, $opt_merges, @opt_anchors); our ($opt_defaultcmd_interactive); our $us = qw(git-debrebase); @@ -985,7 +985,7 @@ sub classify ($) { return $unknown->("octopus merge"); } - if (!$ENV{GIT_DEBREBASE_EXPERIMENTAL_MERGE}) { + if (!$opt_merges) { return $unknown->("general two-parent merge"); } @@ -2850,6 +2850,7 @@ getoptions_main 'anchor=s' => \@opt_anchors, '--dgit=s' => \($dgit[0]), 'force!', + 'experimental-merge-resolution!', \$opt_merges, '-i:s' => sub { my ($opt,$val) = @_; badusage "git-debrebase: no cuddling to -i for git-rebase" |