mirror of
https://github.com/git/git.git
synced 2024-10-30 22:07:53 +01:00
Merge branch 'tz/asciidoctor-fixes'
Doc updates. * tz/asciidoctor-fixes: Documentation/git-status: fix titles in porcelain v2 section Documentation/rev-list-options: wrap --date=<format> block with "--"
This commit is contained in:
commit
ec8fcc780c
2 changed files with 19 additions and 15 deletions
|
@ -278,7 +278,8 @@ Header lines start with "#" and are added in response to specific
|
|||
command line arguments. Parsers should ignore headers they
|
||||
don't recognize.
|
||||
|
||||
### Branch Headers
|
||||
Branch Headers
|
||||
^^^^^^^^^^^^^^
|
||||
|
||||
If `--branch` is given, a series of header lines are printed with
|
||||
information about the current branch.
|
||||
|
@ -294,7 +295,8 @@ Line Notes
|
|||
------------------------------------------------------------
|
||||
....
|
||||
|
||||
### Changed Tracked Entries
|
||||
Changed Tracked Entries
|
||||
^^^^^^^^^^^^^^^^^^^^^^^
|
||||
|
||||
Following the headers, a series of lines are printed for tracked
|
||||
entries. One of three different line formats may be used to describe
|
||||
|
@ -365,7 +367,8 @@ Field Meaning
|
|||
--------------------------------------------------------
|
||||
....
|
||||
|
||||
### Other Items
|
||||
Other Items
|
||||
^^^^^^^^^^^
|
||||
|
||||
Following the tracked entries (and if requested), a series of
|
||||
lines will be printed for untracked and then ignored items
|
||||
|
@ -379,7 +382,8 @@ Ignored items have the following format:
|
|||
|
||||
! <path>
|
||||
|
||||
### Pathname Format Notes and -z
|
||||
Pathname Format Notes and -z
|
||||
^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
||||
|
||||
When the `-z` option is given, pathnames are printed as is and
|
||||
without any quoting and lines are terminated with a NUL (ASCII 0x00)
|
||||
|
|
|
@ -805,12 +805,13 @@ include::pretty-options.txt[]
|
|||
author's). If `-local` is appended to the format (e.g.,
|
||||
`iso-local`), the user's local time zone is used instead.
|
||||
+
|
||||
--
|
||||
`--date=relative` shows dates relative to the current time,
|
||||
e.g. ``2 hours ago''. The `-local` option has no effect for
|
||||
`--date=relative`.
|
||||
+
|
||||
|
||||
`--date=local` is an alias for `--date=default-local`.
|
||||
+
|
||||
|
||||
`--date=iso` (or `--date=iso8601`) shows timestamps in a ISO 8601-like format.
|
||||
The differences to the strict ISO 8601 format are:
|
||||
|
||||
|
@ -818,15 +819,14 @@ The differences to the strict ISO 8601 format are:
|
|||
- a space between time and time zone
|
||||
- no colon between hours and minutes of the time zone
|
||||
|
||||
+
|
||||
`--date=iso-strict` (or `--date=iso8601-strict`) shows timestamps in strict
|
||||
ISO 8601 format.
|
||||
+
|
||||
|
||||
`--date=rfc` (or `--date=rfc2822`) shows timestamps in RFC 2822
|
||||
format, often found in email messages.
|
||||
+
|
||||
|
||||
`--date=short` shows only the date, but not the time, in `YYYY-MM-DD` format.
|
||||
+
|
||||
|
||||
`--date=raw` shows the date as seconds since the epoch (1970-01-01
|
||||
00:00:00 UTC), followed by a space, and then the timezone as an offset
|
||||
from UTC (a `+` or `-` with four digits; the first two are hours, and
|
||||
|
@ -835,28 +835,28 @@ with `strftime("%s %z")`).
|
|||
Note that the `-local` option does not affect the seconds-since-epoch
|
||||
value (which is always measured in UTC), but does switch the accompanying
|
||||
timezone value.
|
||||
+
|
||||
|
||||
`--date=human` shows the timezone if the timezone does not match the
|
||||
current time-zone, and doesn't print the whole date if that matches
|
||||
(ie skip printing year for dates that are "this year", but also skip
|
||||
the whole date itself if it's in the last few days and we can just say
|
||||
what weekday it was). For older dates the hour and minute is also
|
||||
omitted.
|
||||
+
|
||||
|
||||
`--date=unix` shows the date as a Unix epoch timestamp (seconds since
|
||||
1970). As with `--raw`, this is always in UTC and therefore `-local`
|
||||
has no effect.
|
||||
+
|
||||
|
||||
`--date=format:...` feeds the format `...` to your system `strftime`,
|
||||
except for %z and %Z, which are handled internally.
|
||||
Use `--date=format:%c` to show the date in your system locale's
|
||||
preferred format. See the `strftime` manual for a complete list of
|
||||
format placeholders. When using `-local`, the correct syntax is
|
||||
`--date=format-local:...`.
|
||||
+
|
||||
|
||||
`--date=default` is the default format, and is similar to
|
||||
`--date=rfc2822`, with a few exceptions:
|
||||
|
||||
--
|
||||
- there is no comma after the day-of-week
|
||||
|
||||
- the time zone is omitted when the local time zone is used
|
||||
|
|
Loading…
Reference in a new issue