Skip to content

Commit

Permalink
keep track of all keys relevant renaming when merging and obtaining s…
Browse files Browse the repository at this point in the history
…tatus
  • Loading branch information
Byron committed Feb 9, 2023
1 parent 230a11f commit 0f2ed59
Showing 1 changed file with 16 additions and 0 deletions.
16 changes: 16 additions & 0 deletions src/plumbing/progress.rs
Original file line number Diff line number Diff line change
Expand Up @@ -433,6 +433,22 @@ static GIT_CONFIG: &[Record] = &[
note: Some("required for big monorepos, and typically used in conjunction with sparse indices")
}
},
Record {
config: "merge.renameLimit",
usage: Planned { note: Some("The same as diff.renameLimit") }
},
Record {
config: "merge.renames",
usage: Planned { note: Some("The same as diff.renames") }
},
Record {
config: "status.renameLimit",
usage: Planned { note: Some("definitely needed to do status properly, even though it doesn't have to be there for day one. The same as diff.renameLimit") }
},
Record {
config: "status.renames",
usage: Planned { note: Some("the same as diff.renames") }
},
];

/// A programmatic way to record and display progress.
Expand Down

0 comments on commit 0f2ed59

Please sign in to comment.