mirror of
https://github.com/git/git.git
synced 2024-11-06 09:13:01 +01:00
5162e69732
Between AsciiDoc 8.2.2 and 8.2.3, the following change was made to the stock Asciidoc configuration: @@ -149,7 +153,10 @@ # Inline macros. # Backslash prefix required for escape processing. # (?s) re flag for line spanning. -(?su)[\\]?(?P<name>\w(\w|-)*?):(?P<target>\S*?)(\[(?P<attrlist>.*?)\])= + +# Explicit so they can be nested. +(?su)[\\]?(?P<name>(http|https|ftp|file|mailto|callto|image|link)):(?P<target>\S*?)(\[(?P<attrlist>.*?)\])= + # Anchor: [[[id]]]. Bibliographic anchor. (?su)[\\]?\[\[\[(?P<attrlist>[\w][\w-]*?)\]\]\]=anchor3 # Anchor: [[id,xreflabel]] This default regex now matches explicit values, and unfortunately in this case gitlink was being matched by just 'link', causing the wrong inline macro template to be applied. By renaming the macro, we can avoid being matched by the wrong regex. Signed-off-by: Dan McGee <dpmcgee@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
70 lines
1.9 KiB
Text
70 lines
1.9 KiB
Text
git-status(1)
|
|
=============
|
|
|
|
NAME
|
|
----
|
|
git-status - Show the working tree status
|
|
|
|
|
|
SYNOPSIS
|
|
--------
|
|
'git-status' <options>...
|
|
|
|
DESCRIPTION
|
|
-----------
|
|
Displays paths that have differences between the index file and the
|
|
current HEAD commit, paths that have differences between the working
|
|
tree and the index file, and paths in the working tree that are not
|
|
tracked by git (and are not ignored by linkgit:gitignore[5]). The first
|
|
are what you _would_ commit by running `git commit`; the second and
|
|
third are what you _could_ commit by running `git add` before running
|
|
`git commit`.
|
|
|
|
The command takes the same set of options as `git-commit`; it
|
|
shows what would be committed if the same options are given to
|
|
`git-commit`.
|
|
|
|
If there is no path that is different between the index file and
|
|
the current HEAD commit (i.e., there is nothing to commit by running
|
|
`git-commit`), the command exits with non-zero status.
|
|
|
|
|
|
OUTPUT
|
|
------
|
|
The output from this command is designed to be used as a commit
|
|
template comment, and all the output lines are prefixed with '#'.
|
|
|
|
The paths mentioned in the output, unlike many other git commands, are
|
|
made relative to the current directory if you are working in a
|
|
subdirectory (this is on purpose, to help cutting and pasting). See
|
|
the status.relativePaths config option below.
|
|
|
|
|
|
CONFIGURATION
|
|
-------------
|
|
|
|
The command honors `color.status` (or `status.color` -- they
|
|
mean the same thing and the latter is kept for backward
|
|
compatibility) and `color.status.<slot>` configuration variables
|
|
to colorize its output.
|
|
|
|
If the config variable `status.relativePaths` is set to false, then all
|
|
paths shown are relative to the repository root, not to the current
|
|
directory.
|
|
|
|
See Also
|
|
--------
|
|
linkgit:gitignore[5]
|
|
|
|
Author
|
|
------
|
|
Written by Linus Torvalds <torvalds@osdl.org> and
|
|
Junio C Hamano <junkio@cox.net>.
|
|
|
|
Documentation
|
|
--------------
|
|
Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.
|
|
|
|
GIT
|
|
---
|
|
Part of the linkgit:git[7] suite
|