mirror of
https://github.com/git/git.git
synced 2024-11-19 15:34:51 +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>
91 lines
2.8 KiB
Text
91 lines
2.8 KiB
Text
git-reflog(1)
|
|
=============
|
|
|
|
NAME
|
|
----
|
|
git-reflog - Manage reflog information
|
|
|
|
|
|
SYNOPSIS
|
|
--------
|
|
'git reflog' <subcommand> <options>
|
|
|
|
DESCRIPTION
|
|
-----------
|
|
The command takes various subcommands, and different options
|
|
depending on the subcommand:
|
|
|
|
[verse]
|
|
git reflog expire [--dry-run] [--stale-fix] [--verbose]
|
|
[--expire=<time>] [--expire-unreachable=<time>] [--all] <refs>...
|
|
|
|
git reflog [show] [log-options] [<ref>]
|
|
|
|
Reflog is a mechanism to record when the tip of branches are
|
|
updated. This command is to manage the information recorded in it.
|
|
|
|
The subcommand "expire" is used to prune older reflog entries.
|
|
Entries older than `expire` time, or entries older than
|
|
`expire-unreachable` time and are not reachable from the current
|
|
tip, are removed from the reflog. This is typically not used
|
|
directly by the end users -- instead, see linkgit:git-gc[1].
|
|
|
|
The subcommand "show" (which is also the default, in the absence of any
|
|
subcommands) will take all the normal log options, and show the log of
|
|
the reference provided in the command-line (or `HEAD`, by default).
|
|
The reflog will cover all recent actions (HEAD reflog records branch switching
|
|
as well). It is an alias for 'git log -g --abbrev-commit --pretty=oneline';
|
|
see linkgit:git-log[1].
|
|
|
|
The reflog is useful in various git commands, to specify the old value
|
|
of a reference. For example, `HEAD@\{2\}` means "where HEAD used to be
|
|
two moves ago", `master@\{one.week.ago\}` means "where master used to
|
|
point to one week ago", and so on. See linkgit:git-rev-parse[1] for
|
|
more details.
|
|
|
|
|
|
OPTIONS
|
|
-------
|
|
|
|
--stale-fix::
|
|
This revamps the logic -- the definition of "broken commit"
|
|
becomes: a commit that is not reachable from any of the refs and
|
|
there is a missing object among the commit, tree, or blob
|
|
objects reachable from it that is not reachable from any of the
|
|
refs.
|
|
+
|
|
This computation involves traversing all the reachable objects, i.e. it
|
|
has the same cost as 'git prune'. Fortunately, once this is run, we
|
|
should not have to ever worry about missing objects, because the current
|
|
prune and pack-objects know about reflogs and protect objects referred by
|
|
them.
|
|
|
|
--expire=<time>::
|
|
Entries older than this time are pruned. Without the
|
|
option it is taken from configuration `gc.reflogExpire`,
|
|
which in turn defaults to 90 days.
|
|
|
|
--expire-unreachable=<time>::
|
|
Entries older than this time and are not reachable from
|
|
the current tip of the branch are pruned. Without the
|
|
option it is taken from configuration
|
|
`gc.reflogExpireUnreachable`, which in turn defaults to
|
|
30 days.
|
|
|
|
--all::
|
|
Instead of listing <refs> explicitly, prune all refs.
|
|
|
|
--verbose::
|
|
Print extra information on screen.
|
|
|
|
Author
|
|
------
|
|
Written by Junio C Hamano <junkio@cox.net>
|
|
|
|
Documentation
|
|
--------------
|
|
Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
|
|
|
|
GIT
|
|
---
|
|
Part of the linkgit:git[7] suite
|