Git diff for .docx format file in ubuntu
Use pandoc to realize it.
- Install pandoc
sudo apt-get install pandoc
- Create or edit file ~/.gitconfig to add
[diff "pandoc"] textconv=pandoc --to=markdown prompt = false [alias] wdiff = diff --word-diff=color --unified=1
- In git working directory, create or edit file .gitattributes
*.docx diff=pandoc
-
Use git wdiff to show diff between commits and working tree or between two commits for .docx file, commitsId can get use command git log
git wdiff file.docx
git wdiff commitsId1 commitsId2 file.docs
相關推薦
Git diff for .docx format file in ubuntu
Use pandoc to realize it. Install pandoc sudo apt-get install pandoc Create or edit file ~/.gitconfig to add [diff "pandoc"] &n
git command tips: find big file in commit history
git rev-list --objects --all | grep "$(git verify-pack -v .git/objects/pack/*.idx | sort -k 3 -n | ta
Ubuntu Error: ENOSPC:System limit for number of file watchers reached
在使用Ubuntu進行開發時,會遇到這個錯誤! 今天使用react-native的時候 這個錯誤的意思時系統對檔案監控的數量已經到達限制數量了!! 造成的結果: 執行的命令失敗!或丟擲警告(比如執行 react-native start 或者開啟 vsocde) 解決方
How to Install OpenCV in Ubuntu 16.04 LTS for C / C++
Step 1 – Updating Ubuntu $ sudo apt-get update $ sudo apt-get upgrade Step 2 – Install dependencies $ sudo apt-get install build-esse
Git add 報錯The file will have its original line endings in your working directory
報錯的圖片如下 解決的方式如下: 原因,查到了一個,不知道是不是 Git下處理“換行”(line ending) core.autocrlf是git中負責處理line ending的變數,可以設定3個值:true,false,inout。 (1)設定為true【c
Git提交時提示‘The file will have its original line endings in your working directory’
折騰Hexo部落格有一陣子,每次提交的時候直接Hexo d後沒管,這次仔細看了提交時的輸出日誌,發現滿屏提示 warning: LF will be replaced by CRLF in xxxxx The file will have its original line e
Include a Testng.xml File in the Tests.jar File for Device Farm
Amazon Web Services is Hiring. Amazon Web Services (AWS) is a dynamic, growing business unit within Amazon.com. We are currently hiring So
The issue about using Git bash for Docker in window
I recently installed Docker for Windows on my laptop. When I tried running the default docker run -it ubuntu bash demo from Git Bash, I
關於 could not read symbols: File in wrong format 問題的解決方案
最近有個專案需要用到第三方的lib,而在它們的官網上面下載了linux版本的so 於是根據它們提供的文件來呼叫so裡面的函式,用ndk將so編譯到我自己的jni lib 中去。但是編譯是過了,連結時出問題了: could not read symbols: File in
JAVA_HOME not recognized by tomcat7 in Ubuntu
chang fault .bashrc point source port missing tomcat7 openjdk vi .bashrc 添加: export JAVA_HOME=/usr/lib/jvm/java-8-oracle export JRE_HOM
[LeetCode] Find Duplicate File in System 在系統中尋找重復文件
rec number odi test input info mean sam digi Given a list of directory info including directory path, and all the files with contents
How to Change Default Location for Outlook Data File (PST & OST)
note right folder dialog https error data locate http Is there a way to change the default location of new .pst file when create a new e-
java 讀取配置文件工具類 (how to read values from properties file in java)
讀取 public resource fault .get exce ram trac stat Java 讀取配置文件工具類 使用 java.util.Properties import java.io.IOException; import java.io.Inpu
啟動weblogic報錯:string value '2.4' is not a valid enumeration value for web-app-versionType in namespace http://java.sun.com/xml/ns/javaee
-a xsd not app b- 1.0 ring encoding ont 啟動報錯: 原因:有人改動了web.xml的頭 解決方法: 在web.xml中修改擡頭為: <?xml version="1.0" encoding="UTF-8"?> <we
609. Find Duplicate File in System(LeetCode)
sam als dig () vector sum most optimize mat Given a list of directory info including directory path, and all the files with contents in t
PHP錯誤Parse error: syntax error, unexpected end of file in test.php on line 12解決方法
空格 短標簽 後來 成了 出現 提示 分享 也會 出錯 今天在寫PHP程序的時候總是出現這樣的錯誤:Parse error: syntax error, unexpected end of file in *.php on line *,然後我就根據提示,找到那個文件,然後
git diff提示filemode發生改變
git diff mode 今天 pull 代碼 ,提示代碼被修改,需要先提交,git status顯示修改了大量文件,git diff提示filemode變化,如下:diff --git a/Android.mk b/Android.mk old mode 100644 new mode 100
[Angular] Create a custom validator for template driven forms in Angular
height series complex handle style rop guide temp help User input validation is a core part of creating proper HTML forms. Form validator
git diff 簡單用法
ket heartbeat area ews mit 一行 格式 blank toc git diff ----------------用來比較,用法: 1.staging area和working area的文件 (無其他參數時) 指令:git diff 2.mast
Issues in using gym-gazebo in Ubuntu 14.04
creat issues fur tensor learning tps cat -i don Overview OpenAI-gym (Git Repo) provides a great toolkit and a playgroud for research on D