- reset_to_commit $r;
- run_script @{$l->{log}};
- run 'git', 'commit', '--allow-empty', '-m', "::stable-branch::rebase=$r"
- or die "git-commit: $!";
+ if($cmd eq 'rebase')
+ {
+ local $do_commit = 0;
+ reset_to_commit $r;
+ run_script @{$l->{log}};
+ run 'git', 'commit', '--allow-empty', '-m', "::stable-branch::rebase=$r"
+ or die "git-commit: $!";
+ }
+ elsif($cmd eq 'resetrebase')
+ {
+ run_script ['reset', $r], @{$l->{log}};
+ }
+ elsif($cmd eq 'hardresetrebase')
+ {
+ run_script ['hardreset', $r], @{$l->{log}};
+ }