delta/git.git/Documentation/git.txt, branch jk/diff-submodule-diff-inline

Sync with 2.9.2

2016-07-15T17:49:23+00:00

* maint:
  Git 2.9.2
  t0006: skip "far in the future" test when unsigned long is not long enough

Git 2.9.2

2016-07-15T17:48:16+00:00

Signed-off-by: Junio C Hamano

Merge branch 'mm/doc-tt'

2016-07-13T18:24:14+00:00

More mark-up updates to typeset strings that are expected to
literally typed by the end user in fixed-width font.

* mm/doc-tt:
  doc: typeset HEAD and variants as literal
  CodingGuidelines: formatting HEAD in documentation
  doc: typeset long options with argument as literal
  doc: typeset '--' as literal
  doc: typeset long command-line options as literal
  doc: typeset short command-line options as literal
  Documentation/git-mv.txt: fix whitespace indentation

Sync with v2.9.1

2016-07-11T17:46:39+00:00

* maint:
  Git 2.9.1

Git 2.9.1

2016-07-11T17:45:50+00:00

Signed-off-by: Junio C Hamano

Merge branch 'jn/preformatted-doc-url' into maint

2016-07-11T17:44:16+00:00

The top level documentation "git help git" still pointed at the
documentation set hosted at now-defunct google-code repository.
Update it to point to https://git.github.io/htmldocs/git.html
instead.

* jn/preformatted-doc-url:
  doc: git-htmldocs.googlecode.com is no more

Merge branch 'jn/preformatted-doc-url'

2016-07-11T17:31:07+00:00

The top level documentation "git help git" still pointed at the
documentation set hosted at now-defunct google-code repository.
Update it to point to https://git.github.io/htmldocs/git.html
instead.

* jn/preformatted-doc-url:
  doc: git-htmldocs.googlecode.com is no more

Merge branch 'ep/http-curl-trace'

2016-07-06T20:38:06+00:00

HTTP transport gained an option to produce more detailed debugging
trace.

* ep/http-curl-trace:
  imap-send.c: introduce the GIT_TRACE_CURL enviroment variable
  http.c: implement the GIT_TRACE_CURL environment variable

Merge branch 'tr/doc-tt' into maint

2016-07-06T20:06:34+00:00

The documentation set has been updated so that literal commands,
configuration variables and environment variables are consistently
typeset in fixed-width font and bold in manpages.

* tr/doc-tt:
  doc: change configuration variables format
  doc: more consistency in environment variables format
  doc: change environment variables format
  doc: clearer rule about formatting literals

doc: typeset long command-line options as literal

2016-06-28T15:36:45+00:00

Similarly to the previous commit, use backquotes instead of
forward-quotes, for long options.

This was obtained with:

  perl -pi -e "s/'(--[a-z][a-z=<>-]*)'/\`\$1\`/g" *.txt

and manual tweak to remove false positive in ascii-art (o'--o'--o' to
describe rewritten history).

Signed-off-by: Matthieu Moy 
Signed-off-by: Junio C Hamano