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

2024-07-23 Thread Zhao Liu
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 > Subject: [RFC PATCH v5 5/8] .gitattributes: add Rust diff and merge > attributes > X-Mailer: git-send-email 2.44.0 > > Set rust sou

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

2024-07-22 Thread Manos Pitsidianakis
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 Signed-off-by: Manos Pitsidianakis --- .gitattributes | 3 +++ 1 file changed, 3 insertions(+) diff --git a/