diff

Since git diff in powershell mostly results in a unreadable amount of whitespace or strange characters, I installed Perforce P4Merge, to handle merging and diff. However, I can't make git diff open the p4merge application to view the diff in. So far my .gitconfig looks like this: [diff] tool = p4diff [difftool "p4diff"] external = 'C:/PROGRA~1/Perforce/p4merge.exe "$LOCAL" "$REMOTE"' prompt = false [merge] keepBackup = false tool = p4merge [mergetool "p4merge"] cmd = "$BASE" "$LOCAL" "$REMOTE" "$MERGED" path = 'C:/PROGRA~1/Perforce/p4merge.exe' prompt = false keepBackup = false keepTemporaries

Is there an open source command-line tool (for Linux) to diff XML files which ignores the element order? Example input file a.xml : <tag name="AAA"> <attr name="b" value="1"/> <attr name="c" value="2"/> <attr name="a" value="3"/> </tag> <tag name="BBB"> <attr name="x" value="111"/> <attr name="z" value="222"/> </tag> <tag name="BBB"> <attr name="x" value="333"/> <attr name="z" value="444"/> </tag> b.xml : <tag name="AAA"> <attr name="a" value="3"/> <attr name="b" value="1"/> <attr name="c" value="2"/> </tag> <tag name="BBB"> <attr name="z" value="444"/> <attr name="x" value="333"/> </tag> <tag

Assume I have two branches, master and new_feature I was supposed to work on a specific feature, I thought this feature would be part of new_feature so, I checked out specific_feature branch out of the new_feature branch, like so git checkout -b specific_feature Now I did a lot development in this specific_feature branch, merged upstream/new_feature into it a couple of times to get the remote changes. Now, I come to know that my specific_feature should have been branched out of master not new_feature . ( new_feature branch is not ready to be pushed) Is there a way I can take the diff between

I looking for a way to create Delta Diff Patches of Large Binary Files (VMWare Virtual Disk Files). Is there an implementation in C# or any useful methods in the the .NET Framework. Any help is appreciated. Thanks. rAyt There's nothing built into the framework to do this. You're going to have to look for 3rd party solutions, commercial or free, or write your own. A common algorithm is the VCDiff algorithm, which is used by quite a large number of products. bsdiff was designed to create very small patches for binary files. As stated on its page, it requires max(17*n,9*n+m)+O(1) bytes of memory

I want to manage Excel files in one of my repositories. Diffing them is a problem (they are binary files). However, there is a nice tool for diffing them: https://github.com/na-ka-na/ExcelCompare I wanted to set it up using .gitattributes *.xls diff=excel *.xlsx diff=excel And in the .git/config : [diff "excel"] textconv = excel_cmp.bat The command excel_cmp.bat file1.xls file2.xls works very well. However, the setup I use above seems to try to convert the excel files to text using excel_cmp.bat and then diffs the text output. How do I setup the diff tool to diff two files - and not to convert

I'm using Intellij IDEA 14 on Windows and Git as VCS on Unix server. The line separator in Windows is CLRF ( \r\n ) and LF ( \n ) in Unix. In Git, I'm using config --global core.autocrlf input . This will translate all CRLF's to LF's upon commit. When I'm using "Reformat code" option on well-formatted file, IDEA marks files as changed and shows diff in line separators only. How can I disable that in IDEA? In the bottom right of your window, change [CRLF] to [LF] I'm also developing on windows and Because our servers are powered by Linux and all the code has to base on Linux I have preferred to