{"thread":{"id":"16308","subject":"[PATCH] Documentation: New GUI configuration and command-line options.","startedAt":"2008-11-13T17:28:49Z","lastAt":"2008-11-16T22:05:10Z","messageCount":2,"participants":["Alexander Gavrilov","Shawn O. Pearce"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"95702","messageId":"200811132028.49450.angavrilov@gmail.com","threadId":"16308","inReplyTo":null,"subject":"[PATCH] Documentation: New GUI configuration and command-line options.","fromName":"Alexander Gavrilov","fromEmail":"angavrilov@gmail.com","sentAt":"2008-11-13T17:28:49Z","receivedAt":"2008-11-13T17:28:49Z","isPatch":true,"sender":{"key":"angavrilov@gmail.com","avatar":"https://avatars.githubusercontent.com/u/42666?v=4"},"body":"Add information on new git-gui and gitk command-line options,\nconfiguration variables, and the encoding attribute.\n\nSigned-off-by: Alexander Gavrilov <angavrilov@gmail.com>\n---\n Documentation/config.txt        |   24 ++++++++++++++++++++++++\n Documentation/git-gui.txt       |   19 +++++++++++++++++++\n Documentation/gitattributes.txt |   17 +++++++++++++++++\n Documentation/gitk.txt          |    5 +++++\n 4 files changed, 65 insertions(+), 0 deletions(-)\n\ndiff --git a/Documentation/config.txt b/Documentation/config.txt\nindex 965ed74..2223dc4 100644\n--- a/Documentation/config.txt\n+++ b/Documentation/config.txt\n@@ -796,6 +796,14 @@ gui.diffcontext::\n \tSpecifies how many context lines should be used in calls to diff\n \tmade by the linkgit:git-gui[1]. The default is \"5\".\n \n+gui.encoding::\n+\tSpecifies the default encoding to use for displaying of\n+\tfile contents in linkgit:git-gui[1] and linkgit:gitk[1].\n+\tIt can be overridden by setting the 'encoding' attribute\n+\tfor relevant files (see linkgit:gitattributes[5]).\n+\tIf this option is not set, the tools default to the\n+\tlocale encoding.\n+\n gui.matchtrackingbranch::\n \tDetermines if new branches created with linkgit:git-gui[1] should\n \tdefault to tracking remote branches with matching names or\n@@ -818,6 +826,22 @@ gui.spellingdictionary::\n \tthe linkgit:git-gui[1]. When set to \"none\" spell checking is turned\n \toff.\n \n+gui.fastcopyblame::\n+\tIf true, 'git gui blame' uses '-C' instead of '-C -C' for original\n+\tlocation detection. It makes blame significantly faster on huge\n+\trepositories at the expense of less thorough copy detection.\n+\n+gui.copyblamethreshold::\n+\tSpecifies the theshold to use in 'git gui blame' original location\n+\tdetection, measured in alphanumeric characters. See the\n+\tlinkgit:git-blame[1] manual for more information on copy detection.\n+\n+gui.blamehistoryctx::\n+\tSpecifies the radius of history context in days to show in\n+\tlinkgit:gitk[1] for the selected commit, when the `Show History\n+\tContext` menu item is invoked from 'git gui blame'. If this\n+\tvariable is set to zero, the whole history is shown.\n+\n help.browser::\n \tSpecify the browser that will be used to display help in the\n \t'web' format. See linkgit:git-help[1].\ndiff --git a/Documentation/git-gui.txt b/Documentation/git-gui.txt\nindex 0e650f4..d0bc98b 100644\n--- a/Documentation/git-gui.txt\n+++ b/Documentation/git-gui.txt\n@@ -65,9 +65,28 @@ git gui blame v0.99.8 Makefile::\n \texample the file is read from the object database and not\n \tthe working directory.\n \n+git gui blame --line=100 Makefile::\n+\n+\tLoads annotations as described above and automatically\n+\tscrolls the view to center on line '100'.\n+\n git gui citool::\n \n \tMake one commit and return to the shell when it is complete.\n+\tThis command returns a non-zero exit code if the window was\n+\tclosed in any way other than by making a commit.\n+\n+git gui citool --amend::\n+\n+\tAutomatically enter the 'Amend Last Commit' mode of\n+\tthe interface.\n+\n+git gui citool --nocommit::\n+\n+\tBehave as normal citool, but instead of making a commit\n+\tsimply terminate with a zero exit code. It still checks\n+\tthat the index does not contain any unmerged entries, so\n+\tyou can use it as a GUI version of linkgit:git-mergetool[1]\n \n git citool::\n \ndiff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt\nindex eb64841..e02899f 100644\n--- a/Documentation/gitattributes.txt\n+++ b/Documentation/gitattributes.txt\n@@ -495,6 +495,23 @@ in the file.  E.g. the string `$Format:%H$` will be replaced by the\n commit hash.\n \n \n+Viewing files in GUI tools\n+~~~~~~~~~~~~~~~~~~~~~~~~~~\n+\n+`encoding`\n+^^^^^^^^^^\n+\n+The value of this attribute specifies the character encoding that should\n+be used by GUI tools (e.g. linkgit:gitk[1] and linkgit:git-gui[1]) to\n+display the contents of the relevant file. Note that due to performance\n+considerations linkgit:gitk[1] does not use this attribute unless you\n+manually enable per-file encodings in its options.\n+\n+If this attribute is not set or has an invalid value, the value of the\n+`gui.encoding` configuration variable is used instead\n+(See linkgit:git-config[1]).\n+\n+\n USING ATTRIBUTE MACROS\n ----------------------\n \ndiff --git a/Documentation/gitk.txt b/Documentation/gitk.txt\nindex ae29a00..317f631 100644\n--- a/Documentation/gitk.txt\n+++ b/Documentation/gitk.txt\n@@ -56,6 +56,11 @@ frequently used options.\n \tUse this instead of explicitly specifying <revs> if the set of\n \tcommits to show may vary between refreshes.\n \n+--select-commit=<ref>::\n+\n+\tAutomatically select the specified commit after loading the graph.\n+\tDefault behavior is equivalent to specifying '--select-commit=HEAD'.\n+\n <revs>::\n \n \tLimit the revisions to show. This can be either a single revision\n-- \n1.6.0.3.15.gb8d36\n"},{"id":"95980","messageId":"20081116220510.GH2932@spearce.org","threadId":"16308","inReplyTo":"200811132028.49450.angavrilov@gmail.com","subject":"Re: [PATCH] Documentation: New GUI configuration and command-line options.","fromName":"Shawn O. Pearce","fromEmail":"spearce@spearce.org","sentAt":"2008-11-16T22:05:10Z","receivedAt":"2008-11-16T22:05:10Z","isPatch":true,"sender":{"key":"spearce@spearce.org","avatar":"https://avatars.githubusercontent.com/u/34844?v=4"},"body":"Alexander Gavrilov <angavrilov@gmail.com> wrote:\n> Add information on new git-gui and gitk command-line options,\n> configuration variables, and the encoding attribute.\n> \n> Signed-off-by: Alexander Gavrilov <angavrilov@gmail.com>\n\nAcked-by: Shawn O. Pearce <spearce@spearce.org>\n\n> ---\n>  Documentation/config.txt        |   24 ++++++++++++++++++++++++\n>  Documentation/git-gui.txt       |   19 +++++++++++++++++++\n>  Documentation/gitattributes.txt |   17 +++++++++++++++++\n>  Documentation/gitk.txt          |    5 +++++\n>  4 files changed, 65 insertions(+), 0 deletions(-)\n> \n> diff --git a/Documentation/config.txt b/Documentation/config.txt\n> index 965ed74..2223dc4 100644\n> --- a/Documentation/config.txt\n> +++ b/Documentation/config.txt\n> @@ -796,6 +796,14 @@ gui.diffcontext::\n>  \tSpecifies how many context lines should be used in calls to diff\n>  \tmade by the linkgit:git-gui[1]. The default is \"5\".\n>  \n> +gui.encoding::\n> +\tSpecifies the default encoding to use for displaying of\n> +\tfile contents in linkgit:git-gui[1] and linkgit:gitk[1].\n> +\tIt can be overridden by setting the 'encoding' attribute\n> +\tfor relevant files (see linkgit:gitattributes[5]).\n> +\tIf this option is not set, the tools default to the\n> +\tlocale encoding.\n> +\n>  gui.matchtrackingbranch::\n>  \tDetermines if new branches created with linkgit:git-gui[1] should\n>  \tdefault to tracking remote branches with matching names or\n> @@ -818,6 +826,22 @@ gui.spellingdictionary::\n>  \tthe linkgit:git-gui[1]. When set to \"none\" spell checking is turned\n>  \toff.\n>  \n> +gui.fastcopyblame::\n> +\tIf true, 'git gui blame' uses '-C' instead of '-C -C' for original\n> +\tlocation detection. It makes blame significantly faster on huge\n> +\trepositories at the expense of less thorough copy detection.\n> +\n> +gui.copyblamethreshold::\n> +\tSpecifies the theshold to use in 'git gui blame' original location\n> +\tdetection, measured in alphanumeric characters. See the\n> +\tlinkgit:git-blame[1] manual for more information on copy detection.\n> +\n> +gui.blamehistoryctx::\n> +\tSpecifies the radius of history context in days to show in\n> +\tlinkgit:gitk[1] for the selected commit, when the `Show History\n> +\tContext` menu item is invoked from 'git gui blame'. If this\n> +\tvariable is set to zero, the whole history is shown.\n> +\n>  help.browser::\n>  \tSpecify the browser that will be used to display help in the\n>  \t'web' format. See linkgit:git-help[1].\n> diff --git a/Documentation/git-gui.txt b/Documentation/git-gui.txt\n> index 0e650f4..d0bc98b 100644\n> --- a/Documentation/git-gui.txt\n> +++ b/Documentation/git-gui.txt\n> @@ -65,9 +65,28 @@ git gui blame v0.99.8 Makefile::\n>  \texample the file is read from the object database and not\n>  \tthe working directory.\n>  \n> +git gui blame --line=100 Makefile::\n> +\n> +\tLoads annotations as described above and automatically\n> +\tscrolls the view to center on line '100'.\n> +\n>  git gui citool::\n>  \n>  \tMake one commit and return to the shell when it is complete.\n> +\tThis command returns a non-zero exit code if the window was\n> +\tclosed in any way other than by making a commit.\n> +\n> +git gui citool --amend::\n> +\n> +\tAutomatically enter the 'Amend Last Commit' mode of\n> +\tthe interface.\n> +\n> +git gui citool --nocommit::\n> +\n> +\tBehave as normal citool, but instead of making a commit\n> +\tsimply terminate with a zero exit code. It still checks\n> +\tthat the index does not contain any unmerged entries, so\n> +\tyou can use it as a GUI version of linkgit:git-mergetool[1]\n>  \n>  git citool::\n>  \n> diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt\n> index eb64841..e02899f 100644\n> --- a/Documentation/gitattributes.txt\n> +++ b/Documentation/gitattributes.txt\n> @@ -495,6 +495,23 @@ in the file.  E.g. the string `$Format:%H$` will be replaced by the\n>  commit hash.\n>  \n>  \n> +Viewing files in GUI tools\n> +~~~~~~~~~~~~~~~~~~~~~~~~~~\n> +\n> +`encoding`\n> +^^^^^^^^^^\n> +\n> +The value of this attribute specifies the character encoding that should\n> +be used by GUI tools (e.g. linkgit:gitk[1] and linkgit:git-gui[1]) to\n> +display the contents of the relevant file. Note that due to performance\n> +considerations linkgit:gitk[1] does not use this attribute unless you\n> +manually enable per-file encodings in its options.\n> +\n> +If this attribute is not set or has an invalid value, the value of the\n> +`gui.encoding` configuration variable is used instead\n> +(See linkgit:git-config[1]).\n> +\n> +\n>  USING ATTRIBUTE MACROS\n>  ----------------------\n>  \n> diff --git a/Documentation/gitk.txt b/Documentation/gitk.txt\n> index ae29a00..317f631 100644\n> --- a/Documentation/gitk.txt\n> +++ b/Documentation/gitk.txt\n> @@ -56,6 +56,11 @@ frequently used options.\n>  \tUse this instead of explicitly specifying <revs> if the set of\n>  \tcommits to show may vary between refreshes.\n>  \n> +--select-commit=<ref>::\n> +\n> +\tAutomatically select the specified commit after loading the graph.\n> +\tDefault behavior is equivalent to specifying '--select-commit=HEAD'.\n> +\n>  <revs>::\n>  \n>  \tLimit the revisions to show. This can be either a single revision\n> -- \n> 1.6.0.3.15.gb8d36\n\n-- \nShawn.\n"}]}