Сравнение бинарных файлов (архивы, офис)

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
+

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
 

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