From: Manos Pitsidianakis <manos.pitsidianakis@linaro.org>
Date: Thu, 3 Oct 2024 13:28:47 +0000 (+0300)
Subject: .gitattributes: add Rust diff and merge attributes
X-Git-Tag: v9.2.0-rc0~54^2~13
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2d308fe9c16b6b877acc82ff5d5c3436c795826b;p=thirdparty%2Fqemu.git

.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 <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>
---

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