git/Documentation/git-log.txt, branch v2.3.2

Merge branch 'jj/log-doc'

2013-12-03T19:41:41Z

Mark-up fixes. * jj/log-doc: Documentation/git-log.txt: mark-up fix and minor rephasing Documentation/git-log: update "--log-size" description

Documentation/git-log.txt: mark-up fix and minor rephasing

2013-11-13T22:09:14Z

- typeset options, commands, and paths in monospace; - typeset references to sections with emphasis; - replace some double quotes with proper AsciiDoc quotes (e.g. ``foo''); - use title case when referring to section headings. Signed-off-by: Jason St. John Signed-off-by: Junio C Hamano

Documentation/git-log: update "--log-size" description

2013-11-13T22:06:17Z

"--log-size" was added in commit 9fa3465, and the commit message contained a satisfactory explanation; however, the man page entry for it did not describe the actual output format, what the output meant and what the option was meant to be used for. Helped-by: Jonathan Nieder Signed-off-by: Jason St. John Signed-off-by: Junio C Hamano

line-range-format.txt: clarify -L:regex usage form

2013-08-06T21:26:26Z

blame/log documentation describes -L option as: -L, -L: and can take one of these forms: * number * /regex/ * +offset or -offset * :regex which is incorrect and confusing since :regex is not one of the valid forms of or ; in fact, it must be -L's lone argument. Clarify by discussing : at the same indentation level as " and ...": -L, -L: and can take one of these forms: * number * /regex/ * +offset or -offset If : is given in place of and ... Signed-off-by: Eric Sunshine Signed-off-by: Junio C Hamano

git-log.txt: place each -L option variation on its own line

2013-08-06T21:25:22Z

Standard practice in Git documentation is for each variation of an option (such as: -p / --porcelain) to be placed on its own line in the OPTIONS table. The -L option does not follow suit. It cuddles "-L ,:" and "-L ::", separated by a comma. This is inconsistent and potentially confusing since the comma separating them is typeset the same as the comma in ",". Fix this by placing each variation on its own line. Signed-off-by: Eric Sunshine Signed-off-by: Junio C Hamano

Merge branch 'mm/diff-no-patch-synonym-to-s'

2013-07-22T18:23:27Z

"git show -s" was less discoverable than it should be. * mm/diff-no-patch-synonym-to-s: Documentation/git-log.txt: capitalize section names Documentation: move description of -s, --no-patch to diff-options.txt Documentation/git-show.txt: include common diff options, like git-log.txt diff: allow --patch & cie to override -s/--no-patch diff: allow --no-patch as synonym for -s t4000-diff-format.sh: modernize style

Documentation/git-log.txt: capitalize section names

2013-07-18T00:50:56Z

This is the convention in most other files and even at the beginning of git-log.txt Signed-off-by: Matthieu Moy Reviewed-by: Jonathan Nieder Signed-off-by: Junio C Hamano

git-log.txt: fix typesetting of example "git-log -L" invocation

2013-07-17T19:58:36Z

All surrounding examples are typeset as monospaced text. Follow suit. Signed-off-by: Eric Sunshine Acked-by: Thomas Rast Signed-off-by: Junio C Hamano

Merge branch 'ph/builtin-srcs-are-in-subdir-these-days'

2013-06-26T22:07:48Z

* ph/builtin-srcs-are-in-subdir-these-days: fix "builtin-*" references to be "builtin/*"

fix "builtin-" references to be "builtin/"

2013-06-18T18:05:51Z

Documentation and some comments still refer to files in builtin/ as 'builtin-*.[cho]'. Update these to show the correct location. Signed-off-by: Phil Hord Reviewed-by: Jonathan Nieder Assisted-by: Junio C Hamano Signed-off-by: Junio C Hamano