diff mbox series

[RFC,v5,5/8] .gitattributes: add Rust diff and merge attributes

Message ID 990592c7c93a3b2b692dd773c4c9191a82146a80.1721648163.git.manos.pitsidianakis@linaro.org (mailing list archive)
State New, archived
Headers show
Series Add Rust support, implement ARM PL011 | expand

Commit Message

Manos Pitsidianakis July 22, 2024, 11:43 a.m. UTC 
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>
Signed-off-by: Manos Pitsidianakis <manos.pitsidianakis@linaro.org>
---
 .gitattributes | 3 +++
 1 file changed, 3 insertions(+)

Comments

Zhao Liu July 23, 2024, 8:38 a.m. UTC | #1 
On Mon, Jul 22, 2024 at 02:43:35PM +0300, Manos Pitsidianakis wrote:
> Date: Mon, 22 Jul 2024 14:43:35 +0300
> From: Manos Pitsidianakis <manos.pitsidianakis@linaro.org>
> Subject: [RFC PATCH v5 5/8] .gitattributes: add Rust diff and merge
>  attributes
> X-Mailer: git-send-email 2.44.0
> 
> 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>
> Signed-off-by: Manos Pitsidianakis <manos.pitsidianakis@linaro.org>
> ---
>  .gitattributes | 3 +++
>  1 file changed, 3 insertions(+)

Reviewed-by: Zhao Liu <zhao1.liu@intel.com>
diff mbox series

Patch

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