diff mbox series

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

Message ID b51249befbee4186a6c0fd6c6c0542f0413e0477.1720094395.git.manos.pitsidianakis@linaro.org
State New
Headers show
Series Add Rust support, implement ARM PL011 | expand

Commit Message

Manos Pitsidianakis July 4, 2024, 12:15 p.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)

Signed-off-by: Manos Pitsidianakis <manos.pitsidianakis@linaro.org>
---
 .gitattributes | 3 +++
 1 file changed, 3 insertions(+)

Comments

Alex Bennée July 10, 2024, 8:44 a.m. UTC | #1 
Manos Pitsidianakis <manos.pitsidianakis@linaro.org> 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 <manos.pitsidianakis@linaro.org>

Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
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