Compare commits

..

4 Commits

Author SHA1 Message Date
0e64a95ae5 Git 1.7.11.1
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-06-21 14:43:59 -07:00
60475183c0 docs: always define git-relative-html-prefix attribute
Commit fe77b41 introduced a new attribute to let the linkgit macro
create cross-directory HTML references from the technical/ and howto/
subdirectories back to the main documentation. We define that attribute
to "../" on the command-line when building inside those subdirectories,
and otherwise leave it unset under the assumption that it would default
to being blank.  Instead, asciidoc omits the link entirely, leading to
broken documentation. Fix this by defining git-relative-html-prefix to
blank in asciidoc.conf (and an instance on the command-line, when
present, will override it).

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-06-20 23:35:08 -07:00
d28436736a git-commit-tree(1): update synopsis
Even with many new kinds of options, the command still takes the
single <tree> as the first argument.

Probably we would want to update the command to allow it to take
<tree>-ish at the end for consistency.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-06-19 11:36:57 -07:00
b4ab1980da Documentation: spelling fixes
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-06-19 11:35:19 -07:00
10 changed files with 22 additions and 10 deletions

View File

@ -0,0 +1,9 @@
Git v1.7.11.1 Release Notes
===========================
Fixes since v1.7.11
-------------------
* The cross links in the HTML version of manual pages were broken.
Also contains minor typofixes and documentation updates.

View File

@ -90,6 +90,8 @@ endif::backend-docbook[]
endif::doctype-manpage[] endif::doctype-manpage[]
ifdef::backend-xhtml11[] ifdef::backend-xhtml11[]
[attributes]
git-relative-html-prefix=
[linkgit-inlinemacro] [linkgit-inlinemacro]
<a href="{git-relative-html-prefix}{target}.html">{target}{0?({0})}</a> <a href="{git-relative-html-prefix}{target}.html">{target}{0?({0})}</a>
endif::backend-xhtml11[] endif::backend-xhtml11[]

View File

@ -54,7 +54,7 @@ and accumulating child directory counts in the parent directories:
diff.statGraphWidth:: diff.statGraphWidth::
Limit the width of the graph part in --stat output. If set, applies Limit the width of the graph part in --stat output. If set, applies
to all commands generating --stat outuput except format-patch. to all commands generating --stat output except format-patch.
diff.external:: diff.external::
If this config variable is set, diff generation is not If this config variable is set, diff generation is not

View File

@ -9,7 +9,7 @@ SYNOPSIS
-------- --------
[verse] [verse]
'git column' [--command=<name>] [--[raw-]mode=<mode>] [--width=<width>] 'git column' [--command=<name>] [--[raw-]mode=<mode>] [--width=<width>]
[--indent=<string>] [--nl=<string>] [--pading=<n>] [--indent=<string>] [--nl=<string>] [--padding=<n>]
DESCRIPTION DESCRIPTION
----------- -----------

View File

@ -10,7 +10,7 @@ SYNOPSIS
-------- --------
[verse] [verse]
'git commit-tree' <tree> [(-p <parent>)...] < changelog 'git commit-tree' <tree> [(-p <parent>)...] < changelog
'git commit-tree' [(-p <parent>)...] [(-m <message>)...] [(-F <file>)...] <tree> 'git commit-tree' <tree> [(-p <parent>)...] [(-m <message>)...] [(-F <file>)...]
DESCRIPTION DESCRIPTION
----------- -----------
@ -45,7 +45,7 @@ OPTIONS
Each '-p' indicates the id of a parent commit object. Each '-p' indicates the id of a parent commit object.
-m <message>:: -m <message>::
A paragraph in the commig log message. This can be given more than A paragraph in the commit log message. This can be given more than
once and each <message> becomes its own paragraph. once and each <message> becomes its own paragraph.
-F <file>:: -F <file>::

View File

@ -44,9 +44,10 @@ unreleased) version of git, that is available from 'master'
branch of the `git.git` repository. branch of the `git.git` repository.
Documentation for older releases are available here: Documentation for older releases are available here:
* link:v1.7.11/git.html[documentation for release 1.7.11] * link:v1.7.11.1/git.html[documentation for release 1.7.11.1]
* release notes for * release notes for
link:RelNotes/1.7.11.1.txt[1.7.11.1],
link:RelNotes/1.7.11.txt[1.7.11]. link:RelNotes/1.7.11.txt[1.7.11].
* link:v1.7.10.5/git.html[documentation for release 1.7.10.5] * link:v1.7.10.5/git.html[documentation for release 1.7.10.5]
@ -734,7 +735,7 @@ other
'GIT_EDITOR':: 'GIT_EDITOR'::
This environment variable overrides `$EDITOR` and `$VISUAL`. This environment variable overrides `$EDITOR` and `$VISUAL`.
It is used by several git comands when, on interactive mode, It is used by several git commands when, on interactive mode,
an editor is to be launched. See also linkgit:git-var[1] an editor is to be launched. See also linkgit:git-var[1]
and the `core.editor` option in linkgit:git-config[1]. and the `core.editor` option in linkgit:git-config[1].

View File

@ -244,7 +244,7 @@ $highlight_bin::
By default set to 'highlight'; set it to full path to highlight By default set to 'highlight'; set it to full path to highlight
executable if it is not installed on your web server's PATH. executable if it is not installed on your web server's PATH.
Note that 'highlight' feature must be set for gitweb to actually Note that 'highlight' feature must be set for gitweb to actually
use syntax hightlighting. use syntax highlighting.
+ +
*NOTE*: if you want to add support for new file type (supported by *NOTE*: if you want to add support for new file type (supported by
"highlight" but not used by gitweb), you need to modify `%highlight_ext` "highlight" but not used by gitweb), you need to modify `%highlight_ext`

View File

@ -1600,7 +1600,7 @@ dangling tree b24c2473f1fd3d91352a624795be026d64c8841f
You will see informational messages on dangling objects. They are objects You will see informational messages on dangling objects. They are objects
that still exist in the repository but are no longer referenced by any of that still exist in the repository but are no longer referenced by any of
your branches, and can (and will) be removed after a while with "gc". your branches, and can (and will) be removed after a while with "gc".
You can run `git fsck --no-dangling` to supress these messages, and still You can run `git fsck --no-dangling` to suppress these messages, and still
view real errors. view real errors.
[[recovering-lost-changes]] [[recovering-lost-changes]]

View File

@ -1,7 +1,7 @@
#!/bin/sh #!/bin/sh
GVF=GIT-VERSION-FILE GVF=GIT-VERSION-FILE
DEF_VER=v1.7.11 DEF_VER=v1.7.11.1
LF=' LF='
' '

View File

@ -1 +1 @@
Documentation/RelNotes/1.7.11.txt Documentation/RelNotes/1.7.11.1.txt