diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-08-27 14:11:23 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-08-27 14:11:23 -0700 |
| commit | a00504d4382d1ae561f4199e9d3bcf65a8045ecd (patch) | |
| tree | 02c2f48bdefba25f947ea52b29fdddda57f18f5d /git-difftool.html | |
| parent | b9dc76c4ad0987d352a0d26620978a14e8f09714 (diff) | |
| download | git-htmldocs-a00504d4382d1ae561f4199e9d3bcf65a8045ecd.tar.gz | |
Autogenerated HTML docs for v1.7.12-116-g31e0100
Diffstat (limited to 'git-difftool.html')
| -rw-r--r-- | git-difftool.html | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/git-difftool.html b/git-difftool.html index cb393244a..76ab5e501 100644 --- a/git-difftool.html +++ b/git-difftool.html @@ -675,6 +675,23 @@ with custom merge tool commands and has the same value as <tt>$MERGED</tt>.</p>< </p>
</dd>
<dt class="hdlist1">
+--symlinks
+</dt>
+<dt class="hdlist1">
+--no-symlinks
+</dt>
+<dd>
+<p>
+ <em>git difftool</em>'s default behavior is create symlinks to the
+ working tree when run in <tt>--dir-diff</tt> mode.
+</p>
+<div class="literalblock">
+<div class="content">
+<pre><tt>Specifying `--no-symlinks` instructs 'git difftool' to create
+copies instead. `--no-symlinks` is the default on Windows.</tt></pre>
+</div></div>
+</dd>
+<dt class="hdlist1">
-x <command>
</dt>
<dt class="hdlist1">
@@ -790,7 +807,7 @@ difftool.prompt <div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2012-05-10 11:44:38 PDT
+Last updated 2012-08-27 14:06:30 PDT
</div>
</div>
</body>
|