git/Documentation/git-submodule.txt, branch v2.18.2

Merge branch 'rd/doc-remote-tracking-with-hyphen'

2018-06-18T17:18:43Z

Doc update. * rd/doc-remote-tracking-with-hyphen: Use hyphenated "remote-tracking branch" (docs and comments)

Use hyphenated "remote-tracking branch" (docs and comments)

2018-06-13T16:57:09Z

Use the obvious consensus of hyphenated "remote-tracking branch", and fix an obvious typo, all in documentation and comments. Signed-off-by: Robert P. J. Day Signed-off-by: Junio C Hamano

Merge branch 'cf/submodule-progress-dissociate'

2018-05-30T05:04:09Z

"git submodule update" and "git submodule add" supported the "--reference" option to borrow objects from a neighbouring local repository like "git clone" does, but lacked the more recent invention "--dissociate". Also "git submodule add" has been taught to take the "--progress" option. * cf/submodule-progress-dissociate: submodule: add --dissociate option to add/update commands submodule: add --progress option to add command submodule: clean up substitutions in script

submodule: add --dissociate option to add/update commands

2018-05-22T03:22:42Z

Add --dissociate option to add and update commands, both clone helper commands that already have the --reference option --dissociate pairs with. Signed-off-by: Casey Fitzpatrick Signed-off-by: Junio C Hamano

submodule: add --progress option to add command

2018-05-22T03:17:10Z

The '--progress' was introduced in 72c5f88311d (clone: pass --progress decision to recursive submodules, 2016-09-22) to fix the progress reporting of the clone command. Also add the progress option to the 'submodule add' command. The update command already supports the progress flag, but it is not documented. Signed-off-by: Casey Fitzpatrick Signed-off-by: Junio C Hamano

git-submodule.txt: quote usage in monospace, drop backslash

2018-04-18T03:49:26Z

We tend to quote command line examples using `` to set them in a monospace font. The immediate motivation for this patch is to get rid of another instance of \--. As noted in the previous commits, \-- has a tendency of rendering badly. Here, it renders ok (at least with AsciiDoc 8.6.9 and Asciidoctor 1.5.4), but by getting rid of this instance, we reduce the chances of \-- cropping up in places where it matters more. Signed-off-by: Martin Ågren

Doc/git-submodule: improve readability and grammar of a sentence

2018-01-16T19:34:36Z

While at it, correctly quote important words. Signed-off-by: Kaartic Sivaraam Signed-off-by: Junio C Hamano

Merge branch 'sb/submodule-doc'

2017-07-12T22:18:21Z

Doc update. * sb/submodule-doc: submodules: overhaul documentation

Merge branch 'vs/typofixes'

2017-06-30T20:45:25Z

Many typofixes. * vs/typofixes: Spelling fixes

Spelling fixes

2017-06-27T17:35:49Z

Signed-off-by: Ville Skyttä Signed-off-by: Junio C Hamano