StackOverflow2013

Note that there are some explanatory texts on larger screens.

plurals

PO
text
Body
copied!<p>Update June 2012 (2 and an half years later):</p> <p>This (comparing directories instead of file-by-file) seems to be soon available:<br> See <a href="http://article.gmane.org/gmane.linux.kernel/1307164" rel="noreferrer">[ANNOUNCE] Git 1.7.11.rc1</a>:</p> <blockquote> <p>"<code>git difftool</code>" learned the "<code>--dir-diff</code>" option to spawn external diff tools that can <strong>compare two directory hierarchies</strong> at a time after populating two temporary directories, <strong>instead of running an instance of the external tool once per a file pair</strong>.</p> </blockquote> <p>See "<strong><a href="http://git.661346.n2.nabble.com/PATCH-v15-8-9-difftool-teach-difftool-to-handle-directory-diffs-td7492816.html" rel="noreferrer">Patch <code>difftool</code>: teach <code>difftool</code> to handle directory diffs</a></strong>"</p> <hr> <p>Original answer (January 2010)</p> <blockquote> <p>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 the only option?</p> </blockquote> <p>Basically yes:</p> <p>You difftool script would:</p> <ul> <li>create 2 temp directories</li> <li>defines itself as a diff tool</li> <li>call git diff <ul> <li>which then call itself for file to diff</li> <li>in that mode, the same script, for each files, only copy the two version to diff in the two temp directories</li> </ul></li> <li>then go on and call diff tools (like beyondCompare or WinMerge) on the two temp directories</li> </ul> <p>You have one first example in <a href="https://stackoverflow.com/questions/1881594/use-winmerge-inside-of-git-to-file-diff/1884517#1884517">this question</a>.</p>

Querying!

Guidance

An individual column

Larger individual text columns get their own page to allow for proper reading.

SQuiL has stopped working due to an internal error.

If you are curious you may find further information in the browser console, which is accessible through the devtools (F12).

Reload