diff options
| author | Manos Pitsidianakis <manos.pitsidianakis@linaro.org> | 2024-10-03 16:28:47 +0300 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2024-10-11 12:32:17 +0200 |
| commit | 2d308fe9c16b6b877acc82ff5d5c3436c795826b (patch) | |
| tree | 84f31123a946c412a494e92348a07bb2d782bfe2 | |
| parent | 6fdc5bc173188f5e4942616b16d589500b874a15 (diff) | |
| download | qemu-2d308fe9c16b6b877acc82ff5d5c3436c795826b.zip qemu-2d308fe9c16b6b877acc82ff5d5c3436c795826b.tar.gz qemu-2d308fe9c16b6b877acc82ff5d5c3436c795826b.tar.bz2 | |
.gitattributes: add Rust diff and merge attributes
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>
Link: https://lore.kernel.org/r/278e3878b40ecc7c424dec1ed978eedf21469f52.1727961605.git.manos.pitsidianakis@linaro.org
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
| -rw-r--r-- | .gitattributes | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes index a217cb7..6dc6383 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 |