StackOverflow2013

Note that there are some explanatory texts on larger screens.

plurals

PO
text
Body
copied!<h1>Before git version 1.7.11</h1> <p><code>git-diffall</code> is what I need, thanks a lot. With help of this <a href="http://jeetworks.org/node/90" rel="nofollow noreferrer">page</a> about git difftool and this <a href="https://www.mercurial-scm.org/wiki/ExtdiffExtension" rel="nofollow noreferrer">one</a> about running vim+dirdiff from command line, I wrote my <code>$HOME/.gitconfig</code> as:</p> <pre><code>[diff] tool = default-difftool [difftool "default-difftool"] cmd = vim -f '+next' '+execute \"DirDiff\" argv(0) argv(1)' $LOCAL $REMOTE [difftool] prompt = false </code></pre> <p>After putting <code>git-diffall</code> in my <code>PATH</code>, I can diff for example working directory with branch <code>dev</code> with:</p> <pre><code>git diffall dev </code></pre> <p>The <code>--copy-back</code> is also what I need if I want to modify the working directory persitantly from Vim:</p> <pre><code>git diffall --copy-back dev </code></pre> <h1>Since git version 1.7.11</h1> <p>Since version <a href="https://github.com/git/git/blob/master/Documentation/RelNotes/1.7.11.txt" rel="nofollow noreferrer">1.7.11</a>, "git difftool" learned the "--dir-diff" option that simplify things and <code>git-diffall</code> is no longer needed.</p> <p><code>.gitconfig</code> contains:</p> <pre><code>[diff] tool = default-difftool [difftool "default-difftool"] cmd = vim -f '+next' '+execute \"DirDiff\" argv(0) argv(1)' $LOCAL $REMOTE '+syntax off' </code></pre> <p>And diffing for example working directory with branch <code>dev</code> is done with:</p> <pre><code>git difftool -d dev </code></pre>

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