git/Documentation/gitmodules.txt, branch v2.16.2

Merge branch 'ss/submodule-shallow-doc'

2017-04-26T06:39:07Z

Doc update. * ss/submodule-shallow-doc: gitmodules: clarify what history depth a shallow clone has

gitmodules: clarify the ignore option values

2017-04-20T03:03:56Z

Add more structure and describe each possible option in a self-contained way, not referring to any of the previously described options. Signed-off-by: Sebastian Schuberth Signed-off-by: Junio C Hamano

gitmodules: clarify what history depth a shallow clone has

2017-04-20T02:00:54Z

Signed-off-by: Sebastian Schuberth Signed-off-by: Junio C Hamano

Merge branch 'bw/submodule-branch-dot-doc'

2016-10-26T20:14:49Z

Recent git allows submodule..branch to use a special token "." instead of the branch name; the documentation has been updated to describe it. * bw/submodule-branch-dot-doc: submodules doc: update documentation for "." used for submodule branches

submodules doc: update documentation for "." used for submodule branches

2016-10-19T21:58:53Z

4d7bc52b17 ("submodule update: allow '.' for branch value", 2016-08-03) adopted from Gerrit a feature to set "." as a special value of "submodule..branch" in .gitmodules file to indicate that the tracking branch in the submodule should be the same as the current branch in the superproject. Update the documentation to describe this. Signed-off-by: Brandon Williams Signed-off-by: Junio C Hamano

Spelling fixes

2016-08-11T21:35:42Z

accidently accidentally commited committed dependancy dependency emtpy empty existance existence explicitely explicitly git-upload-achive git-upload-archive hierachy hierarchy indegee indegree intial initial mulitple multiple non-existant non-existent precendence. precedence. priviledged privileged programatically programmatically psuedo-binary pseudo-binary soemwhere somewhere successfull successful transfering transferring uncommited uncommitted unkown unknown usefull useful writting writing Signed-off-by: Ville Skyttä Signed-off-by: Junio C Hamano

Merge branch 'sb/submodule-recommend-shallowness'

2016-08-08T21:48:44Z

Doc update. * sb/submodule-recommend-shallowness: gitmodules: document shallow recommendation

gitmodules: document shallow recommendation

2016-08-03T15:53:52Z

Signed-off-by: Stefan Beller Signed-off-by: Junio C Hamano

doc: typeset long command-line options as literal

2016-06-28T15:36:45Z

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

submodule: improve documentation of update subcommand

2015-03-02T22:59:55Z

The documentation of 'git submodule update' has several problems: 1) It mentions that value 'none' of submodule.$name.update can be overridden by --checkout, but other combinations of configuration values and command line options are not mentioned. 2) The documentation of submodule.$name.update is scattered across three places, which is confusing. 3) The documentation of submodule.$name.update in gitmodules.txt is incorrect, because the code always uses the value from .git/config and never from .gitmodules. 4) Documentation of --force was incomplete, because it is only effective in case of checkout method of update. Fix all these problems by documenting submodule.*.update in git-submodule.txt and make everybody else refer to it. Helped-by: Junio C Hamano Helped-by: Jens Lehmann Signed-off-by: Michal Sojka Signed-off-by: Junio C Hamano