mirror of
https://github.com/kastdeur/dotfiles.git
synced 2024-12-22 01:03:35 +01:00
[git] diff docx and odt using pandoc
This commit is contained in:
parent
320dd0baa5
commit
028eac240f
1 changed files with 5 additions and 2 deletions
|
@ -6,8 +6,6 @@
|
||||||
editor = geany
|
editor = geany
|
||||||
[push]
|
[push]
|
||||||
default = matching
|
default = matching
|
||||||
[diff "pdf"]
|
|
||||||
textconv = pdf2txt
|
|
||||||
[core]
|
[core]
|
||||||
excludesfile = ~/.config/git/ignore
|
excludesfile = ~/.config/git/ignore
|
||||||
[color]
|
[color]
|
||||||
|
@ -17,7 +15,12 @@
|
||||||
[branch]
|
[branch]
|
||||||
autosetuprebase = always
|
autosetuprebase = always
|
||||||
[diff]
|
[diff]
|
||||||
|
mnemonicPrefix = true
|
||||||
tool = vimdiff
|
tool = vimdiff
|
||||||
|
[diff "rst"]
|
||||||
|
textconv = pandoc --to=rst
|
||||||
|
[diff "pdf"]
|
||||||
|
textconv = pdf2txt
|
||||||
[alias]
|
[alias]
|
||||||
# Short Fancy Logs
|
# Short Fancy Logs
|
||||||
lg1 = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(bold yellow)%d%C(reset)'
|
lg1 = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(bold yellow)%d%C(reset)'
|
||||||
|
|
Loading…
Reference in a new issue