diff options
| author | Junio C Hamano <junio@kernel.org> | 2010-11-18 00:53:09 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@kernel.org> | 2010-11-18 00:53:09 +0000 |
| commit | 982eb11dc5ca975628029adef95a96309ae25294 (patch) | |
| tree | d4bedc784e5b27293e50d6657b2171549f0be2d6 /git-diff.html | |
| parent | c3fda57fff8451d3c28afc16c6ace06cfd087981 (diff) | |
| download | git-htmldocs-982eb11dc5ca975628029adef95a96309ae25294.tar.gz | |
Autogenerated HTML docs for v1.7.3.2-245-g03276
Diffstat (limited to 'git-diff.html')
| -rw-r--r-- | git-diff.html | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/git-diff.html b/git-diff.html index e4da5e578..d0410c53c 100644 --- a/git-diff.html +++ b/git-diff.html @@ -884,23 +884,6 @@ another file.</p></div> </p>
</dd>
<dt class="hdlist1">
---diff-filter=[(A|C|D|M|R|T|U|X|B)…[*]]
-</dt>
-<dd>
-<p>
- Select only files that are Added (<tt>A</tt>), Copied (<tt>C</tt>),
- Deleted (<tt>D</tt>), Modified (<tt>M</tt>), Renamed (<tt>R</tt>), have their
- type (i.e. regular file, symlink, submodule, …) changed (<tt>T</tt>),
- are Unmerged (<tt>U</tt>), are
- Unknown (<tt>X</tt>), or have had their pairing Broken (<tt>B</tt>).
- Any combination of the filter characters (including none) can be used.
- When <tt>*</tt> (All-or-none) is added to the combination, all
- paths are selected if there is any file that matches
- other criteria in the comparison; if there is no file
- that matches other criteria, nothing is selected.
-</p>
-</dd>
-<dt class="hdlist1">
--find-copies-harder
</dt>
<dd>
@@ -927,6 +910,23 @@ another file.</p></div> </p>
</dd>
<dt class="hdlist1">
+--diff-filter=[(A|C|D|M|R|T|U|X|B)…[*]]
+</dt>
+<dd>
+<p>
+ Select only files that are Added (<tt>A</tt>), Copied (<tt>C</tt>),
+ Deleted (<tt>D</tt>), Modified (<tt>M</tt>), Renamed (<tt>R</tt>), have their
+ type (i.e. regular file, symlink, submodule, …) changed (<tt>T</tt>),
+ are Unmerged (<tt>U</tt>), are
+ Unknown (<tt>X</tt>), or have had their pairing Broken (<tt>B</tt>).
+ Any combination of the filter characters (including none) can be used.
+ When <tt>*</tt> (All-or-none) is added to the combination, all
+ paths are selected if there is any file that matches
+ other criteria in the comparison; if there is no file
+ that matches other criteria, nothing is selected.
+</p>
+</dd>
+<dt class="hdlist1">
-S<string>
</dt>
<dd>
|