Skip to content

Commit

Permalink
Comment out unfinished fast conflict detection
Browse files Browse the repository at this point in the history
  • Loading branch information
Timmmm committed May 24, 2021
1 parent a749baa commit 40deb00
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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<()> {
Expand All @@ -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(())
}

0 comments on commit 40deb00

Please sign in to comment.