git-difftool

In git how to diff microsoft word documents?

∥☆過路亽.° 提交于 2019-12-08 00:06:57
问题 I've been following this guide here on how to diff Microsoft Word documents, but I ran into this error: Usage: /usr/bin/docx2txt.pl [infile.docx|-|-h] [outfile.txt|-] /usr/bin/docx2txt.pl < infile.docx /usr/bin/docx2txt.pl < infile.docx > outfile.txt In second usage, output is dumped on STDOUT. Use '-h' as the first argument to get this usage information. Use '-' as the infile name to read the docx file from STDIN. Use '-' as the outfile name to dump the text on STDOUT. Output is saved in

How to diff .odt files with difftool? kdiff3 diff outputs unreadable characters

*爱你&永不变心* 提交于 2019-12-07 18:16:40
问题 In git I'm trying to use .gitattributes to compare .odt files, libreofice writer files, with difftool. From following this guide: http://www-verimag.imag.fr/~moy/opendocument/ I made a .gitattributes file .gitattributes with this: *.ods diff=odf *.odt diff=odf *.odp diff=odf *.ods difftool=odf *.odt difftool=odf *.odp difftool=odf This made git diff compare the text in .odt, however when git difftool launches kdiff3 to compare the .odt files, I get this pop-up error: Some input characters

How to make git log show file paths relative to current directory?

笑着哭i 提交于 2019-12-05 01:43:07
问题 The current Git-based project that I am working on, I am generally always in a sub-directory. Below is the output when I run the command git log --name-only from a sub-directory of the root of the repository. commit 678bd5ba6fc5474c4c61406768bf6cba5937c5d1 Author: thegreendroid Date: Mon Mar 27 09:36:24 2017 +1300 Commit message child_dir1_from_root/file1 | 184 +-- child_dir2_from_root/file2 | 2 +- How do I instead get git log to output something like below instead? This makes diffing the

Using meld as difftool for git but listing all files in one window

∥☆過路亽.° 提交于 2019-12-04 13:27:53
问题 I want to use meld as my diff tool for git. If I configure my .gitconfig like this : [difftool] prompt = false [diff] tool = meld and run command : $ git difftool then git open a meld window for each file which have changes. But I want one single window with all my files in the meld list box. I have read a little about -d or --dir-diff option. When I try : $ git difftool -d then a single windows is opened with one directory tree in each meld part, but either contain empty directories. I can

How to make git log show file paths relative to current directory?

三世轮回 提交于 2019-12-03 16:43:07
The current Git-based project that I am working on, I am generally always in a sub-directory. Below is the output when I run the command git log --name-only from a sub-directory of the root of the repository. commit 678bd5ba6fc5474c4c61406768bf6cba5937c5d1 Author: thegreendroid Date: Mon Mar 27 09:36:24 2017 +1300 Commit message child_dir1_from_root/file1 | 184 +-- child_dir2_from_root/file2 | 2 +- How do I instead get git log to output something like below instead? This makes diffing the files listed really easy, by just copying the file path and running git diff HEAD~ {copied_file_path}

Using meld as difftool for git but listing all files in one window

假装没事ソ 提交于 2019-12-03 07:39:17
I want to use meld as my diff tool for git. If I configure my .gitconfig like this : [difftool] prompt = false [diff] tool = meld and run command : $ git difftool then git open a meld window for each file which have changes. But I want one single window with all my files in the meld list box. I have read a little about -d or --dir-diff option. When I try : $ git difftool -d then a single windows is opened with one directory tree in each meld part, but either contain empty directories. I can not open my files from here. For infomation : $ git --version git version 1.9.1 $ meld --version meld 1

How to setup kdiff3 in Mac OS?

只愿长相守 提交于 2019-12-02 19:15:45
In .gitconfig file I setup up the git diff as follows: [diff] tool = kdiff3 [difftool "kdiff3"] path = path_directory/kdiff3.app In this setting kdiff is not accessible and I get the following error when I run in terminal >> git difftool The diff tool kdiff3 is not available as 'Kdiff_local_software_path/kdiff3.app' fatal: external diff died, stopping at modified_file Do you have any suggestion I can fix this issue ? In my current setup Mac OS 10.10.5 git diff tool is git merge tool that I want to replace with kdiff. hjpotter92 kdiff3 is generally located at the following location:

The diff tool in Visual Studio when using the Git Plugin

Deadly 提交于 2019-12-02 19:07:08
Microsoft has released a Git plugin for Visual Studio 2012 . I have found it to be excellent, but there doesn't seem to be any option to change the default Diff tool. Worse, I cannot do a diff at all on ascx codebehind files. It only shows a diff option for the main .ASCX file. How do you Diff the codebehind files when using the git plugin? Change the diff tool? You have to change your local .gitconfig, rather than make the change through Visual Studio as you would with TFS https://gist.github.com/mkchandler/2377564 Add the following to your global .gitconfig file: [diff] tool = diffmerge

`git config interactive.diffFilter diff-highlight`: the same diff by lines - and without color

一世执手 提交于 2019-12-01 07:07:36
问题 After git config --global interactive.diffFilter diff-highlight my .gitconfig : # This is Git's per-user configuration file. [user] name = Vitaly Zdanevich email = vitaly.zdanevich@xxx.com [core] excludesfile = /Users/vitaly/.gitignore_global [filter "lfs"] clean = git-lfs clean -- %f smudge = git-lfs smudge --skip -- %f process = git-lfs filter-process --skip required = true [diff] tool = vimdiff context = 20 [difftool] prompt = false [interactive] diffFilter = diff-highlight But in git

git - set KDiff3 as default mergetool

别说谁变了你拦得住时间么 提交于 2019-12-01 06:50:27
问题 After installing KDiff3 for managing conflicts in git , still the default one is opening for me: Here is the configuration that mentioned in this answer: git config --global --add merge.tool kdiff3 git config --global --add mergetool.kdiff3.path "C:/Program Files/KDiff3/kdiff3.exe" git config --global --add mergetool.kdiff3.trustExitCode false git config --global --add diff.guitool kdiff3 git config --global --add difftool.kdiff3.path "C:/Program Files/KDiff3/kdiff3.exe" git config --global -