Signed-off-by: Clemens Buchacher <drizzd@aon.at>
---
This patch applies to git.git.
Documentation/config.txt | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/Documentation/config.txt b/Documentation/config.txt
index aa5411e..5d7d345 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -1049,6 +1049,12 @@ gui.matchtrackingbranch::
default to tracking remote branches with matching names or
not. Default: "false".
+gui.textconv::
+ If this option is enabled, and a textconv filter is defined (see
+ linkgit:gitattributes[5]), linkgit:git-gui[1] shows the converted diff.
+ Staging individual hunks is not possible for such diffs, however.
+ Default: "true".
+
gui.newbranchtemplate::
Is used as suggested name when creating new branches using the
linkgit:git-gui[1].
--
1.7.1.rc0.27.g3b0c
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
