[git-users] git diff not showing details

2013-10-06 Thread Peter Pitchford
Windows 7 Git Bash or Command line, both act the same. When I change a file and then run *git diff* I get: C:\workshop\git>git diff diff --git a/thirdfile.txt b/thirdfile.txt index 7caac66..f6eb45c 100644 Binary files a/thirdfile.txt and b/thirdfile.txt differ How do I get it to show the lines t

Re: [git-users] git diff not showing details

2013-10-06 Thread Philip Oakley
Git thinks they are binary files. This is a symptom that they probably have null bytes (not ASCII text) in them and are probably unicode. You will need a diff tool that will cope with such unicode (assuming they are proper text files). set the config options appropriately so that your text file

[git-users] Re: git diff not showing details

2013-10-06 Thread Peter Pitchford
It turns out git diff doesn't understand utf-16 encoded files. The clue is that the output says "Binary files" I switched the encoding to utf-8 and git diff now shows the details. " UTF-16 is a historical accident that persists mainly due to inertia. UTF-16 has no practical advantages over UTF

[git-users] Re: git diff not showing details

2013-10-06 Thread Matthew Johnson
Ah, so contrary to an earlier assertion in this thread, Git and Git diff command specifically DO understand Unicode -- just not in the outdated UTF-16 transformation format. On Sunday, October 6, 2013 9:49:12 AM UTC-7, Peter Pitchford wrote: > > It turns out git diff doesn't understand utf-16 en

[git-users] CM Synergy to Git conversion utility

2013-10-06 Thread Pankaj Gupta
Hi, I'm looking for a CM synergy to GIT conversion utility.  Once i know all available utilities in market, i shall look at which one suits best. Currently i know if PySynergy (https://github.com/emanuelez/PySynergy)  but did not really use it. Thanks for help, -Pankaj -- You received this me

Re: [git-users] multi workspace solution

2013-10-06 Thread pof Andras
Oh, yes, I know it is a simple script. if it was really usable there should be some information about its possibilities and practices and experiences. A script alone without any additional info looks like an abandoned tool for me. Actually I do not care about Windows at all, we work only on linu