Skip to content

fix typos #907

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 2, 2023
Merged

fix typos #907

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions examples/diff.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ struct Args {
/// output condensed summary of header info
flag_summary: bool,
#[structopt(name = "find-renames", short = "M", long)]
/// set threshold for findind renames (default 50)
/// set threshold for finding renames (default 50)
flag_find_renames: Option<u16>,
#[structopt(name = "find-copies", short = "C", long)]
/// set threshold for finding copies (default 50)
Expand All @@ -120,7 +120,7 @@ struct Args {
/// show given source prefix instead of 'a/'
flag_src_prefix: Option<String>,
#[structopt(name = "dst-prefix", long)]
/// show given destinction prefix instead of 'b/'
/// show given destination prefix instead of 'b/'
flag_dst_prefix: Option<String>,
#[structopt(name = "path", long = "git-dir")]
/// path to git repository to use
Expand Down
4 changes: 2 additions & 2 deletions examples/pull.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ fn normal_merge(
let mut idx = repo.merge_trees(&ancestor, &local_tree, &remote_tree, None)?;

if idx.has_conflicts() {
println!("Merge conficts detected...");
println!("Merge conflicts detected...");
repo.checkout_index(Some(&mut idx), None)?;
return Ok(());
}
Expand Down Expand Up @@ -152,7 +152,7 @@ fn do_merge<'a>(
// 1. do a merge analysis
let analysis = repo.merge_analysis(&[&fetch_commit])?;

// 2. Do the appopriate merge
// 2. Do the appropriate merge
if analysis.0.is_fast_forward() {
println!("Doing a fast forward");
// do a fast forward
Expand Down