.gitattributes: add Rust diff and merge attributes

Set rust source code to diff=rust (built-in with new git versions) and merge=binary for Cargo.lock files (they should not be merged but auto-generated by cargo) Reviewed-by: Alex Bennée <[email protected]> Reviewed-by: Zhao Liu <[email protected]> Signed-off-by: Manos Pitsidianakis <[email protected]> Link: https://lore.kernel.org/r/278e3878b40ecc7c424dec1ed978eedf21469f52.1727961605.git.manos.pitsidianakis@linaro.org Signed-off-by: Paolo Bonzini <[email protected]>
cminyard · Oct 11, 2024 · 2d308fe · 2d308fe
1 parent 6fdc5bc
commit 2d308fe
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -2,3 +2,6 @@
 *.h.inc         diff=c
 *.m             diff=objc
 *.py            diff=python
+*.rs            diff=rust
+*.rs.inc        diff=rust
+Cargo.lock      diff=toml merge=binary