Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(750)

Side by Side Diff: man/html/git-hyper-blame.html

Issue 1697423004: git hyper-blame: Added automatically ignoring revs from a file. (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/depot_tools.git@master
Patch Set: Avoid too-long line. Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « git_hyper_blame.py ('k') | man/man1/git-hyper-blame.1 » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" 1 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
2 "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> 2 "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
3 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> 3 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
4 <head> 4 <head>
5 <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" / > 5 <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" / >
6 <meta name="generator" content="AsciiDoc 8.6.9" /> 6 <meta name="generator" content="AsciiDoc 8.6.9" />
7 <title>git-hyper-blame(1)</title> 7 <title>git-hyper-blame(1)</title>
8 <style type="text/css"> 8 <style type="text/css">
9 /* Shared CSS for AsciiDoc xhtml11 and html5 backends */ 9 /* Shared CSS for AsciiDoc xhtml11 and html5 backends */
10 10
(...skipping 737 matching lines...) Expand 10 before | Expand all | Expand 10 after
748 <p>git-hyper-blame - 748 <p>git-hyper-blame -
749 Like git blame, but with the ability to ignore or bypass certain commits. 749 Like git blame, but with the ability to ignore or bypass certain commits.
750 </p> 750 </p>
751 </div> 751 </div>
752 </div> 752 </div>
753 <div id="content"> 753 <div id="content">
754 <div class="sect1"> 754 <div class="sect1">
755 <h2 id="_synopsis">SYNOPSIS</h2> 755 <h2 id="_synopsis">SYNOPSIS</h2>
756 <div class="sectionbody"> 756 <div class="sectionbody">
757 <div class="verseblock"> 757 <div class="verseblock">
758 <pre class="content"><em>git hyper-blame</em> [-i &lt;rev&gt; [-i &lt;rev&gt; &# 8230;]] [&lt;rev&gt;] [--] &lt;file&gt;</pre> 758 <pre class="content"><em>git hyper-blame</em> [-i &lt;rev&gt; [-i &lt;rev&gt; &# 8230;]] [--ignore-file=&lt;file&gt;]
759 [--no-default-ignores] [&lt;rev&gt;] [--] &lt;file&gt;</pre>
759 <div class="attribution"> 760 <div class="attribution">
760 </div></div> 761 </div></div>
761 </div> 762 </div>
762 </div> 763 </div>
763 <div class="sect1"> 764 <div class="sect1">
764 <h2 id="_description">DESCRIPTION</h2> 765 <h2 id="_description">DESCRIPTION</h2>
765 <div class="sectionbody"> 766 <div class="sectionbody">
766 <div class="paragraph"><p><code>git hyper-blame</code> is like <code>git blame</ code> but it can ignore or "look through" a 767 <div class="paragraph"><p><code>git hyper-blame</code> is like <code>git blame</ code> but it can ignore or "look through" a
767 given set of commits, to find the real culprit.</p></div> 768 given set of commits, to find the real culprit.</p></div>
768 <div class="paragraph"><p>This is useful if you have a commit that makes sweepin g changes that are 769 <div class="paragraph"><p>This is useful if you have a commit that makes sweepin g changes that are
769 unlikely to be what you are looking for in a blame, such as mass reformatting or 770 unlikely to be what you are looking for in a blame, such as mass reformatting or
770 renaming. By adding these commits to the hyper-blame ignore list, <code>git 771 renaming. By adding these commits to the hyper-blame ignore list, <code>git
771 hyper-blame</code> will look past these commits to find the previous commit that 772 hyper-blame</code> will look past these commits to find the previous commit that
772 touched a given line.</p></div> 773 touched a given line.</p></div>
773 <div class="paragraph"><p>Follows the normal <code>blame</code> syntax: annotate s <code>&lt;file&gt;</code> with the revision that 774 <div class="paragraph"><p>Follows the normal <code>blame</code> syntax: annotate s <code>&lt;file&gt;</code> with the revision that
774 last modified each line. Optional <code>&lt;rev&gt;</code> specifies the revisio n of <code>&lt;file&gt;</code> to 775 last modified each line. Optional <code>&lt;rev&gt;</code> specifies the revisio n of <code>&lt;file&gt;</code> to
775 start from.</p></div> 776 start from.</p></div>
777 <div class="paragraph"><p>Automatically looks for a file called <code>.git-blame -ignore-revs</code> in the repository
778 root directory. This file has the same syntax as the <code>--ignore-file</code> argument,
779 and any commits mentioned in this file are added to the ignore list.</p></div>
776 </div> 780 </div>
777 </div> 781 </div>
778 <div class="sect1"> 782 <div class="sect1">
779 <h2 id="_options">OPTIONS</h2> 783 <h2 id="_options">OPTIONS</h2>
780 <div class="sectionbody"> 784 <div class="sectionbody">
781 <div class="dlist"><dl> 785 <div class="dlist"><dl>
782 <dt class="hdlist1"> 786 <dt class="hdlist1">
783 -i &lt;rev&gt; 787 -i &lt;rev&gt;
784 </dt> 788 </dt>
785 <dd> 789 <dd>
786 <p> 790 <p>
787 A revision to ignore. Can be specified as many times as needed. 791 A revision to ignore. Can be specified as many times as needed.
788 </p> 792 </p>
789 </dd> 793 </dd>
794 <dt class="hdlist1">
795 --ignore-file=&lt;file&gt;
796 </dt>
797 <dd>
798 <p>
799 A file containing a list of revisions to ignore. Can have comments beginning
800 with <code>#</code>.
801 </p>
802 </dd>
803 <dt class="hdlist1">
804 --no-default-ignores
805 </dt>
806 <dd>
807 <p>
808 Do not ignore commits from the <code>.git-blame-ignore-revs</code> file.
809 </p>
810 </dd>
790 </dl></div> 811 </dl></div>
791 </div> 812 </div>
792 </div> 813 </div>
793 <div class="sect1"> 814 <div class="sect1">
794 <h2 id="_example">EXAMPLE</h2> 815 <h2 id="_example">EXAMPLE</h2>
795 <div class="sectionbody"> 816 <div class="sectionbody">
796 <div class="paragraph"><p>Let&#8217;s run <code>git blame</code> on a file:</p>< /div> 817 <div class="paragraph"><p>Let&#8217;s run <code>git blame</code> on a file:</p>< /div>
797 <div class="paragraph"><p></p></div><div class="listingblock"><div class="conten t"><pre><code><span style="font-weight: bold; color: #ffffff">$ git blame ipsum. txt</span> 818 <div class="paragraph"><p></p></div><div class="listingblock"><div class="conten t"><pre><code><span style="font-weight: bold; color: #ffffff">$ git blame ipsum. txt</span>
798 c6eb3bfa (lorem 2014-08-11 23:15:57 +0000 1) LOREM IPSUM DOLOR SIT AME T, CONSECTETUR 819 c6eb3bfa (lorem 2014-08-11 23:15:57 +0000 1) LOREM IPSUM DOLOR SIT AME T, CONSECTETUR
799 3ddda43c (auto-uppercaser 2014-07-05 02:05:18 +0000 2) ADIPISCING ELIT, SED DO E IUSMOD TEMPOR 820 3ddda43c (auto-uppercaser 2014-07-05 02:05:18 +0000 2) ADIPISCING ELIT, SED DO E IUSMOD TEMPOR
(...skipping 26 matching lines...) Expand all
826 previously modified that line, but it is not always clear where the line came 847 previously modified that line, but it is not always clear where the line came
827 from. If the ignored commit makes lots of changes in close proximity, in 848 from. If the ignored commit makes lots of changes in close proximity, in
828 particular adding/removing/reordering lines, then the wrong authors may be 849 particular adding/removing/reordering lines, then the wrong authors may be
829 blamed for nearby edits.</p></div> 850 blamed for nearby edits.</p></div>
830 <div class="paragraph"><p>For this reason, <code>hyper-blame</code> works best w hen the ignored commits are be 851 <div class="paragraph"><p>For this reason, <code>hyper-blame</code> works best w hen the ignored commits are be
831 limited to minor changes such as formatting and renaming, not refactoring or 852 limited to minor changes such as formatting and renaming, not refactoring or
832 other more invasive changes.</p></div> 853 other more invasive changes.</p></div>
833 </div> 854 </div>
834 </div> 855 </div>
835 <div class="sect1"> 856 <div class="sect1">
836 <h2 id="_bugs">BUGS</h2>
837 <div class="sectionbody">
838 <div class="ulist"><ul>
839 <li>
840 <p>
841 There is currently no way to pass the ignore list as a file.
842 </p>
843 </li>
844 <li>
845 <p>
846 It should be possible for a git repository to configure an automatic list of
847 commits to ignore (like <code>.gitignore</code>), so that project owners can m aintain a
848 list of "big change" commits that are ignored by hyper-blame by default.
849 </p>
850 </li>
851 </ul></div>
852 </div>
853 </div>
854 <div class="sect1">
855 <h2 id="_see_also">SEE ALSO</h2> 857 <h2 id="_see_also">SEE ALSO</h2>
856 <div class="sectionbody"> 858 <div class="sectionbody">
857 <div class="paragraph"><p><a href="git-blame.html">git-blame(1)</a></p></div> 859 <div class="paragraph"><p><a href="git-blame.html">git-blame(1)</a></p></div>
858 </div> 860 </div>
859 </div> 861 </div>
860 <div class="sect1"> 862 <div class="sect1">
861 <h2 id="_chromium_depot_tools">CHROMIUM DEPOT_TOOLS</h2> 863 <h2 id="_chromium_depot_tools">CHROMIUM DEPOT_TOOLS</h2>
862 <div class="sectionbody"> 864 <div class="sectionbody">
863 <div class="paragraph"><p>Part of the chromium <a href="depot_tools.html">depot_ tools(7)</a> suite. These tools are meant to 865 <div class="paragraph"><p>Part of the chromium <a href="depot_tools.html">depot_ tools(7)</a> suite. These tools are meant to
864 assist with the development of chromium and related projects. Download the tools 866 assist with the development of chromium and related projects. Download the tools
865 from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git"> here</a>.</p></div> 867 from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git"> here</a>.</p></div>
866 </div> 868 </div>
867 </div> 869 </div>
868 </div> 870 </div>
869 <div id="footnotes"><hr /></div> 871 <div id="footnotes"><hr /></div>
870 <div id="footer"> 872 <div id="footer">
871 <div id="footer-text"> 873 <div id="footer-text">
872 Last updated 2016-02-05 13:43:52 AEDT 874 Last updated 2016-02-19 15:04:46 AEDT
873 </div> 875 </div>
874 </div> 876 </div>
875 </body> 877 </body>
876 </html> 878 </html>
OLDNEW
« no previous file with comments | « git_hyper_blame.py ('k') | man/man1/git-hyper-blame.1 » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698