diff

I've got a website that has a git repo. I cloned the repo so that I could develop in one directory and then push to the repo, and then pull in the live/prod directory (would be interested in suggestions for a better way to do this if there is one, but that's outside the scope of this question). I did the following in the live directory to push all my latest changes: git add . git commit -a // added a message git push I then did the following in the dev directory: git clone git@bitbucket.org:user/repo.git I then opened two files, prod/root/test.php and dev/root/test.php, and they looked

This question already has an answer here: Directory comparison of Git branches 3 answers Is it possible to get the git difftool command to open a directory compare between the changed files and the staging/checked files? So ideally, if 2 files have changed, they would be the only 2 shown, but within a directory compare. I've read posts about getting git to give all file diffs in parallel, so tools like BeyondCompare has all the diffs in tabs , but im not happy with that! One could pull a copy of the changed files from staging/checked in files into a temp folder, and then open that up. Is that

Is there any diff/merge tool for programming languages, that works in a syntax-aware way (like XML Diff Tool), doing more than compare line-by-line (and optionally ignoring whitespace). I'm interested in a program actually following the language syntax and delimeters, suggesting changes without breaking syntactic correctness, or bundling statements separated over multiple lines. Example behavior would be: *upon finding an if(){ which introduces an extra nesting level automatically bundle the closing brace } several lines below with it.) *keep matching syntax elements together, avoid silliness

Is there a way, short of actually checking out the parent commit, to determine a submodule's SHA-1 commit ID based on a commit ID in the parent clone? I know I can find the currently associated SHA-1 with 'git submodule'. Here's an example: I have a clone with a single submodule 'foo' that has changed several times in the last month. I have a tag in the parent clone that is a few weeks old called 'released-1.2.3'. I want to find out what the associated SHA-1 of 'foo' was for this tagged commit. I could simply check out 'released-1.2.3' and use git-submodule to see, but I'm wondering if there's

I'd like to use my own diff when working in a clearcase snapshot view. As far as I can see, there is no way to specify a diff tool when running " cleartool diff ", so I was thinking I could run something like " mydiff <predecessor file> <modified file in my view> ", but I don't know enough about ClearCase to be able to find the "predecessor file" to diff against. Any way to do this? Forgot to mention (until now, after reading the first two responses dealing with windows) that this is on Unix, and I am not allowed to muck with the ClearCase configuration. VonC How to change default diff tools

I've been collecting data from the information returned from git diff <commitId>..<commitId> and I ran into @@ -1 +1 @@ I can't figure out what that's telling me. I've searched a bit on Google but to no avail. Todd A. Jacobs It's a unified diff hunk identifier. This is documented by GNU Diffutils. The unified output format starts with a two-line header, which looks like this: --- from-file from-file-modification-time +++ to-file to-file-modification-time The time stamp looks like 2002-02-21 23:30:39.942229878 -0800 to indicate the date, time with fractional seconds, and time zone. The