diff mbox series

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

Message ID 20241007110342.1298598-6-pbonzini@redhat.com
State New
Headers show
Series [PULL,01/12] Require meson version 1.5.0 | expand

Commit Message

Paolo Bonzini Oct. 7, 2024, 11:03 a.m. UTC 
From: Manos Pitsidianakis <manos.pitsidianakis@linaro.org>

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 <alex.bennee@linaro.org>
Reviewed-by: Zhao Liu <zhao1.liu@intel.com>
Signed-off-by: Manos Pitsidianakis <manos.pitsidianakis@linaro.org>
Link: https://lore.kernel.org/r/278e3878b40ecc7c424dec1ed978eedf21469f52.1727961605.git.manos.pitsidianakis@linaro.org
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 .gitattributes | 3 +++
 1 file changed, 3 insertions(+)
diff mbox series

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