From dc18397ffd44fdabeb36f8ec399c82c309db2684 Mon Sep 17 00:00:00 2001
From: Andrey Astafyev <dev@246060.ru>
Date: Sun, 20 Jun 2021 17:03:37 +0300
Subject: [PATCH] =?UTF-8?q?=D0=A1=D1=80=D0=B0=D0=B2=D0=BD=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=B8=D0=B5=20=D0=B1=D0=B8=D0=BD=D0=B0=D1=80=D0=BD=D1=8B=D1=85?=
 =?UTF-8?q?=20=D1=84=D0=B0=D0=B9=D0=BB=D0=BE=D0=B2=20(=D0=B0=D1=80=D1=85?=
 =?UTF-8?q?=D0=B8=D0=B2=D1=8B,=20=D0=BE=D1=84=D0=B8=D1=81)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 attributes | 14 ++++++++++++++
 config     | 33 ++++++++++++++++++++++++++++++---
 ignore     |  7 +++++--
 3 files changed, 49 insertions(+), 5 deletions(-)
 create mode 100644 attributes

diff --git a/attributes b/attributes
new file mode 100644
index 0000000..e0b214c
--- /dev/null
+++ b/attributes
@@ -0,0 +1,14 @@
+*.bz2 diff=bz2
+*.gz diff=gzip
+*.tar diff=tar
+*.tar.bz2 diff=tar-bz2
+*.zip diff=zip
+
+*.odt diff=pandoc
+*.doc diff=pandoc
+*.docx diff=pandoc
+*.ods diff=localc
+*.xls diff=localc
+*.xlsx diff=localc
+*.odg diff=odf
+
diff --git a/config b/config
index 960d839..5051d79 100644
--- a/config
+++ b/config
@@ -12,8 +12,38 @@
 	tool         = meld
 
 [diff]
+	renames      = copy
+	algorithm    = histogram
 	tool         = meld
 
+[diff "bz2"]
+	binary = true
+	textconv = /bin/bzcat
+[diff "gzip"]
+	binary = true
+	textconv = /bin/zcat
+[diff "tar"]
+	binary = true
+	textconv = tar --to-stdout -xf
+[diff "tar-bz2"]
+	binary = true
+	textconv = tar --to-stdout -xjf
+[diff "zip"]
+	binary = true
+	textconv = unzip -p
+[diff "odf"]
+	textconv = odt2txt
+	binary = true
+[diff "localc"]
+	textconv=unoconv --stdout -f csv -e FilterOptions="44,34,76"
+	prompt = false
+	binary = true
+	cachetextconv = true
+[diff "pandoc"]
+	textconv=pandoc --to=markdown
+	prompt = false
+	binary = true
+
 [difftool]
 	prompt       = false
 
@@ -105,9 +135,6 @@
 	                       git config -f .gitmodules --remove-section submodule.$1 && \
 	                       git config -f .git/config --remove-section submodule.$1; }; f"
 
-[diff]
-	renames      = copy
-
 [log]
 	decorate     = full
 
diff --git a/ignore b/ignore
index 5be04e7..bcd499a 100644
--- a/ignore
+++ b/ignore
@@ -2,13 +2,16 @@
 ### Общие настройки для C, C++, Fortran, Qt, CMake, Ninja, LaTeX и редакторов
 ###
 
+!.gitkeep
+!.gitignore
+
 ###
 ### Временные файлы текстовых редакторов
 ###
 *.bak
 *.gho
 *.tmp
-
+*.dotdropbak
 
 ###
 ### LyX
@@ -78,7 +81,7 @@ tags
 ###
 ### CMake
 ###
-CMakeLists.txt.user
+CMakeLists.txt.user*
 CMakeCache.txt
 CMakeFiles
 CMakeScripts