summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 07f5746)
raw | patch | inline | side by side (parent: 07f5746)
author | David J. Mellor <dmellor@whistlingcat.com> | |
Mon, 2 Mar 2009 06:38:36 +0000 (22:38 -0800) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Mon, 2 Mar 2009 20:34:54 +0000 (12:34 -0800) |
Signed-off-by: David J. Mellor <dmellor@whistlingcat.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/blame-options.txt | patch | blob | history | |
Documentation/git-annotate.txt | patch | blob | history |
index 7f28432254a81e4c39ce8ff204b4d6618050c5c6..df2a7c164130743b28f110bda3d323e978897bce 100644 (file)
Detect moving lines in the file as well. When a commit
moves a block of lines in a file (e.g. the original file
has A and then B, and the commit changes it to B and
- then A), traditional 'blame' algorithm typically blames
+ then A), the traditional 'blame' algorithm typically blames
the lines that were moved up (i.e. B) to the parent and
assigns blame to the lines that were moved down (i.e. A)
to the child commit. With this option, both groups of lines
files that were modified in the same commit. This is
useful when you reorganize your program and move code
around across files. When this option is given twice,
- the command looks for copies from all other files in the
- parent for the commit that creates the file in addition.
+ the command additionally looks for copies from all other
+ files in the parent for the commit that creates the file.
+
<num> is optional but it is the lower bound on the number of
alphanumeric characters that git must detect as moving
index 0aba022ba6838442721a0584f3eaa293a3a90f74..0590eec0566cf9f318ddd1ac27d10bb989b2c52f 100644 (file)
NAME
----
-git-annotate - Annotate file lines with commit info
+git-annotate - Annotate file lines with commit information
SYNOPSIS
--------
DESCRIPTION
-----------
Annotates each line in the given file with information from the commit
-which introduced the line. Optionally annotate from a given revision.
+which introduced the line. Optionally annotates from a given revision.
The only difference between this command and linkgit:git-blame[1] is that
they use slightly different output formats, and this command exists only
-for backward compatibility to support existing scripts, and provide more
+for backward compatibility to support existing scripts, and provide a more
familiar command name for people coming from other SCM systems.
OPTIONS