summaryrefslogtreecommitdiffstats
path: root/git-blame.html
diff options
context:
space:
mode:
authorJunio C Hamano <junio@hera.kernel.org>2006-08-26 08:43:31 +0000
committerJunio C Hamano <junio@hera.kernel.org>2006-08-26 08:43:31 +0000
commit6b2cee12edbdbc714335b12e6cfe34cd4933799f (patch)
tree8a053e17c1915a48817205ed27bbdfd475ced116 /git-blame.html
parent8a0a21e3f8e9d75a455aa4170153405d7f1d74be (diff)
downloadgit-htmldocs-6b2cee12edbdbc714335b12e6cfe34cd4933799f.tar.gz
Autogenerated HTML docs for v1.4.2-ga7f0
Diffstat (limited to 'git-blame.html')
-rw-r--r--git-blame.html28
1 files changed, 21 insertions, 7 deletions
diff --git a/git-blame.html b/git-blame.html
index 250f5ef25..f809e1a92 100644
--- a/git-blame.html
+++ b/git-blame.html
@@ -266,18 +266,32 @@ git-blame(1) Manual Page
<h2>NAME</h2>
<div class="sectionbody">
<p>git-blame -
- Blame file lines on commits
+ Show what revision and author last modified each line of a file
</p>
</div>
</div>
<h2>SYNOPSIS</h2>
<div class="sectionbody">
-<p>git-blame file [options] file [revision]</p>
+<p><em>git-blame</em> [-c] [-l] [-t] [-S &lt;revs-file&gt;] [--] &lt;file&gt; [&lt;rev&gt;]</p>
</div>
<h2>DESCRIPTION</h2>
<div class="sectionbody">
-<p>Annotates each line in the given file with information from the commit
-which introduced the line. Start annotation from the given revision.</p>
+<p>Annotates each line in the given file with information from the revision which
+last modified the line. Optionally, start annotating from the given revision.</p>
+<p>This report doesn't tell you anything about lines which have been deleted or
+replaced; you need to use a tool such as <a href="git-diff.html">git-diff(1)</a> or the "pickaxe"
+interface briefly mentioned in the following paragraph.</p>
+<p>Apart from supporting file annotation, git also supports searching the
+development history for when a code snippet occured in a change. This makes it
+possible to track when a code snippet was added to a file, moved or copied
+between files, and eventually deleted or replaced. It works by searching for
+a text string in the diff. A small example:</p>
+<div class="listingblock">
+<div class="content">
+<pre><tt>$ git log --pretty=oneline -S'blame_usage'
+5040f17eba15504bad66b14a645bddd9b015ebb7 blame -S &lt;ancestry-file&gt;
+ea4c7f9bf69e781dd0cd88d2bccb2bf5cc15c9a7 git-blame: Make the output</tt></pre>
+</div></div>
</div>
<h2>OPTIONS</h2>
<div class="sectionbody">
@@ -287,7 +301,7 @@ which introduced the line. Start annotation from the given revision.</p>
</dt>
<dd>
<p>
- Use the same output mode as git-annotate (Default: off).
+ Use the same output mode as <a href="git-annotate.html">git-annotate(1)</a> (Default: off).
</p>
</dd>
<dt>
@@ -311,7 +325,7 @@ which introduced the line. Start annotation from the given revision.</p>
</dt>
<dd>
<p>
- Use revs from revs-file instead of calling git-rev-list.
+ Use revs from revs-file instead of calling <a href="git-rev-list.html">git-rev-list(1)</a>.
</p>
</dd>
<dt>
@@ -338,7 +352,7 @@ which introduced the line. Start annotation from the given revision.</p>
</div>
<div id="footer">
<div id="footer-text">
-Last updated 15-Jul-2006 01:37:33 UTC
+Last updated 26-Aug-2006 08:43:06 UTC
</div>
</div>
</body>