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

2024-07-10 Thread Alex Bennée
Manos Pitsidianakis writes: > 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) > > Signed-off-by: Manos Pitsidianakis Reviewed-by: Alex Bennée -- Alex Bennée Virtualisation Tec

[RFC PATCH v4 5/7] .gitattributes: add Rust diff and merge attributes

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