diff --git a/src/main.rs b/src/main.rs index ce5ccbd..bc573e3 100644 --- a/src/main.rs +++ b/src/main.rs @@ -13,10 +13,10 @@ struct CliOptions { #[argh(option, default="String::from(\"master\")")] onto: String, - /// try rebasing commit by commit if there are conflicts, instead of trying - /// to determind the conflicting commit on the target branch directly - #[argh(switch)] - slow: bool, + // try rebasing commit by commit if there are conflicts, instead of trying + // to determind the conflicting commit on the target branch directly + // #[argh(switch)] + // slow: bool, } fn main() -> Result<()> { @@ -35,7 +35,7 @@ fn run() -> Result<()> { // Find the repo dir in the same way git does. let repo_path = get_repo_path()?; - autorebase(&repo_path, &options.onto, options.slow)?; + autorebase(&repo_path, &options.onto, /*options.slow*/ true)?; Ok(()) }