[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[RFC PATCH v6 3/5] .gitattributes: add Rust diff and merge attributes
From: |
Manos Pitsidianakis |
Subject: |
[RFC PATCH v6 3/5] .gitattributes: add Rust diff and merge attributes |
Date: |
Mon, 5 Aug 2024 00:04:14 +0300 |
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>
---
.gitattributes | 3 +++
1 file changed, 3 insertions(+)
diff --git a/.gitattributes b/.gitattributes
index a217cb7bfe..6dc6383d3d 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
--
γαῖα πυρί μιχθήτω
- [RFC PATCH v6 0/5] rust-pl011-rfc-v6, Manos Pitsidianakis, 2024/08/04
- [RFC PATCH v6 1/5] build-sys: Add rust feature option, Manos Pitsidianakis, 2024/08/04
- [RFC PATCH v6 3/5] .gitattributes: add Rust diff and merge attributes,
Manos Pitsidianakis <=
- [RFC PATCH v6 2/5] rust: add bindgen step as a meson dependency, Manos Pitsidianakis, 2024/08/04
- [RFC PATCH v6 4/5] rust: add crate to expose bindings and interfaces, Manos Pitsidianakis, 2024/08/04
- [RFC PATCH v6 5/5] rust: add PL011 device model, Manos Pitsidianakis, 2024/08/04
- Re: [RFC PATCH v6 0/5] rust-pl011-rfc-v6, Paolo Bonzini, 2024/08/08