diff options
author | Junio C Hamano <gitster@pobox.com> | 2019-07-19 12:49:37 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2019-07-19 12:49:37 -0700 |
commit | a42e033b20a199fda9e2d77917e9a32105d98bb8 (patch) | |
tree | 39604095440c01f69e9d670a241e120d89aff90d /git-annotate.html | |
parent | 0906e98c10b77ca498915c1d3206c1aa5aba0971 (diff) | |
download | git-htmldocs-a42e033b20a199fda9e2d77917e9a32105d98bb8.tar.gz |
Autogenerated HTML docs for v2.22.0-545-g9c9b96
Diffstat (limited to 'git-annotate.html')
-rw-r--r-- | git-annotate.html | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/git-annotate.html b/git-annotate.html index 0333875cc..748f84283 100644 --- a/git-annotate.html +++ b/git-annotate.html @@ -1000,6 +1000,35 @@ commit. And the default value is 40. If there are more than one take effect.</p></div>
</dd>
<dt class="hdlist1">
+--ignore-rev <rev>
+</dt>
+<dd>
+<p>
+ Ignore changes made by the revision when assigning blame, as if the
+ change never happened. Lines that were changed or added by an ignored
+ commit will be blamed on the previous commit that changed that line or
+ nearby lines. This option may be specified multiple times to ignore
+ more than one revision. If the <code>blame.markIgnoredLines</code> config option
+ is set, then lines that were changed by an ignored commit and attributed to
+ another commit will be marked with a <code>?</code> in the blame output. If the
+ <code>blame.markUnblamableLines</code> config option is set, then those lines touched
+ by an ignored commit that we could not attribute to another revision are
+ marked with a <em>*</em>.
+</p>
+</dd>
+<dt class="hdlist1">
+--ignore-revs-file <file>
+</dt>
+<dd>
+<p>
+ Ignore revisions listed in <code>file</code>, which must be in the same format as an
+ <code>fsck.skipList</code>. This option may be repeated, and these files will be
+ processed after any files specified with the <code>blame.ignoreRevsFile</code> config
+ option. An empty file name, <code>""</code>, will clear the list of revs from
+ previously processed files.
+</p>
+</dd>
+<dt class="hdlist1">
-h
</dt>
<dd>
|