From 3c287d8047908779c98794361f642ec079535ca5 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Martin=20Strau=C3=9F?= <MStrauss@MuellerBBM-vas.de>
Date: Tue, 11 Mar 2014 17:55:40 +0100
Subject: [PATCH] Added missing documentation for the TortoiseGitBlame settings
 page
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

(Fixes issue #2173)

Signed-off-by: Martin Strauß <MStrauss@MuellerBBM-vas.de>
Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
---
 .../en/TortoiseGit/tgit_dug/dug_settings_blame.xml | 73 +++++++++++++++++++++-
 1 file changed, 72 insertions(+), 1 deletion(-)

diff --git a/doc/source/en/TortoiseGit/tgit_dug/dug_settings_blame.xml b/doc/source/en/TortoiseGit/tgit_dug/dug_settings_blame.xml
index 9e7027047..abc395e04 100644
--- a/doc/source/en/TortoiseGit/tgit_dug/dug_settings_blame.xml
+++ b/doc/source/en/TortoiseGit/tgit_dug/dug_settings_blame.xml
@@ -10,6 +10,7 @@
 		</figure>
 		The settings used by TortoiseGitBlame are controlled from the
 		main context menu, not directly with TortoiseGitBlame itself.
+		Details for the parameters for the blame algorithm are described in <xref linkend="git-blame(1)"/>.
 	</para>
 	<variablelist>
 		<varlistentry>
@@ -35,7 +36,7 @@
 			</listitem>
 		</varlistentry>
 		<varlistentry>
-			<term>Tabs</term>
+			<term>Tab size</term>
 			<listitem>
 				<para>
 					Defines how many spaces to use for expansion when a tab character
@@ -44,6 +45,76 @@
 			</listitem>
 		</varlistentry>
 		<varlistentry>
+			<term>Detect moved or copied lines</term>
+			<listitem>
+				<para>
+					<guilabel>Disabled</guilabel>
+					Traditional blame algorithm, the search for parents is limited
+					to the file and will follow renames.
+				</para>
+				<para>
+					<guilabel>Within file</guilabel>
+					Extra passes of inspection are applied to detect moved and
+					copied lines within the file (<literal>git blame -M</literal>). 
+				</para>
+				<para>
+					<guilabel>From modified files</guilabel>
+					In addition to the annotated file detect moved or copied lines 
+					from all modified files within a commit (<literal>git blame -C</literal>). 
+				</para>
+				<para>
+					<guilabel>At file creation</guilabel>
+					In addition to the annotated file and the modified files
+					within a commit detect moved or copied lines from other files
+					in the commit that creates the file (<literal>git blame -C -C</literal>).
+				</para>
+				<para>
+					<guilabel>From existing files</guilabel>
+					In addition detect moved or modified lines from other files in any commit
+					(<literal>git blame -C -C -C</literal>).
+				</para>
+			</listitem>
+		</varlistentry>
+		<varlistentry>
+			<term>Number of characters required for moved or copied line detection</term>
+			<listitem>
+				<para>
+					Lower bound on the number of alphanumeric characters that Git must detect 
+					as moving/copying between files for it to associate those lines with the parent commit.
+				</para>
+				<para>
+					<guilabel>Within a file</guilabel>
+					Number of alphanumeric characters required to detect moving lines within a file 
+					(<literal>git blame -M|&lt;num&gt;|</literal>). 
+				</para>
+				<para>
+					<guilabel>Between files</guilabel>
+					Number of alphanumeric characters required to detect moved or copied lines between files
+					(<literal>git blame -C|&lt;num&gt;|</literal>). 
+				</para>
+			</listitem>
+		</varlistentry>
+		<varlistentry>
+			<term>Ignore whitespace</term>
+			<listitem>
+				<para>
+					Defines if whitespace is ignored when comparing the parent's version and the child's version
+					to find where the lines came from (<literal>git blame -w</literal>).
+				</para>
+			</listitem>
+		</varlistentry>
+		<varlistentry>
+			<term>Show complete log</term>
+			<listitem>
+				<para>
+					Defines if the log should be complete, i.e. the log contains all changes for a file,
+					even the changes have no impact on the file content of the annotated revision.
+					If deactivated the log contains only revisions which last modified a line for the
+					annotated revision.
+				</para>
+			</listitem>
+		</varlistentry>
+		<varlistentry>
 			<term>Follow renames</term>
 			<listitem>
 				<para>
-- 
2.11.4.GIT