[PULL,05/12] .gitattributes: add Rust diff and merge attributes

Commit Message

Paolo Bonzini Oct. 7, 2024, 11:03 a.m. UTC

From: Manos Pitsidianakis <[e-mail]>

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 <[e-mail]>
Reviewed-by: Zhao Liu <[e-mail]>
Signed-off-by: Manos Pitsidianakis <[e-mail]>
Link: https://lore.kernel.org/r/278e3878b40[e-mail]
Signed-off-by: Paolo Bonzini <[e-mail]>
---
 .gitattributes | 3 +++
 1 file changed, 3 insertions(+)

Patch

diff --git a/.gitattributes b/.gitattributes
index a217cb7bfe9..6dc6383d3d1 100644
--- 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