Skip to content

Commit ec8fcc7

Browse files
committed
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 "--"
2 parents 27ff787 + 473dd35 commit ec8fcc7

File tree

2 files changed

+19
-15
lines changed

2 files changed

+19
-15
lines changed

Documentation/git-status.txt

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,8 @@ Header lines start with "#" and are added in response to specific
278278
command line arguments. Parsers should ignore headers they
279279
don't recognize.
280280

281-
### Branch Headers
281+
Branch Headers
282+
^^^^^^^^^^^^^^
282283

283284
If `--branch` is given, a series of header lines are printed with
284285
information about the current branch.
@@ -294,7 +295,8 @@ Line Notes
294295
------------------------------------------------------------
295296
....
296297

297-
### Changed Tracked Entries
298+
Changed Tracked Entries
299+
^^^^^^^^^^^^^^^^^^^^^^^
298300

299301
Following the headers, a series of lines are printed for tracked
300302
entries. One of three different line formats may be used to describe
@@ -365,7 +367,8 @@ Field Meaning
365367
--------------------------------------------------------
366368
....
367369

368-
### Other Items
370+
Other Items
371+
^^^^^^^^^^^
369372

370373
Following the tracked entries (and if requested), a series of
371374
lines will be printed for untracked and then ignored items
@@ -379,7 +382,8 @@ Ignored items have the following format:
379382

380383
! <path>
381384

382-
### Pathname Format Notes and -z
385+
Pathname Format Notes and -z
386+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^
383387

384388
When the `-z` option is given, pathnames are printed as is and
385389
without any quoting and lines are terminated with a NUL (ASCII 0x00)

Documentation/rev-list-options.txt

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -805,28 +805,28 @@ include::pretty-options.txt[]
805805
author's). If `-local` is appended to the format (e.g.,
806806
`iso-local`), the user's local time zone is used instead.
807807
+
808+
--
808809
`--date=relative` shows dates relative to the current time,
809810
e.g. ``2 hours ago''. The `-local` option has no effect for
810811
`--date=relative`.
811-
+
812+
812813
`--date=local` is an alias for `--date=default-local`.
813-
+
814+
814815
`--date=iso` (or `--date=iso8601`) shows timestamps in a ISO 8601-like format.
815816
The differences to the strict ISO 8601 format are:
816817

817818
- a space instead of the `T` date/time delimiter
818819
- a space between time and time zone
819820
- no colon between hours and minutes of the time zone
820821

821-
+
822822
`--date=iso-strict` (or `--date=iso8601-strict`) shows timestamps in strict
823823
ISO 8601 format.
824-
+
824+
825825
`--date=rfc` (or `--date=rfc2822`) shows timestamps in RFC 2822
826826
format, often found in email messages.
827-
+
827+
828828
`--date=short` shows only the date, but not the time, in `YYYY-MM-DD` format.
829-
+
829+
830830
`--date=raw` shows the date as seconds since the epoch (1970-01-01
831831
00:00:00 UTC), followed by a space, and then the timezone as an offset
832832
from UTC (a `+` or `-` with four digits; the first two are hours, and
@@ -835,28 +835,28 @@ with `strftime("%s %z")`).
835835
Note that the `-local` option does not affect the seconds-since-epoch
836836
value (which is always measured in UTC), but does switch the accompanying
837837
timezone value.
838-
+
838+
839839
`--date=human` shows the timezone if the timezone does not match the
840840
current time-zone, and doesn't print the whole date if that matches
841841
(ie skip printing year for dates that are "this year", but also skip
842842
the whole date itself if it's in the last few days and we can just say
843843
what weekday it was). For older dates the hour and minute is also
844844
omitted.
845-
+
845+
846846
`--date=unix` shows the date as a Unix epoch timestamp (seconds since
847847
1970). As with `--raw`, this is always in UTC and therefore `-local`
848848
has no effect.
849-
+
849+
850850
`--date=format:...` feeds the format `...` to your system `strftime`,
851851
except for %z and %Z, which are handled internally.
852852
Use `--date=format:%c` to show the date in your system locale's
853853
preferred format. See the `strftime` manual for a complete list of
854854
format placeholders. When using `-local`, the correct syntax is
855855
`--date=format-local:...`.
856-
+
856+
857857
`--date=default` is the default format, and is similar to
858858
`--date=rfc2822`, with a few exceptions:
859-
859+
--
860860
- there is no comma after the day-of-week
861861

862862
- the time zone is omitted when the local time zone is used

0 commit comments

Comments
 (0)