git/Documentation, branch v2.3.3

Git 2.3.3

2015-03-14T05:57:25Z

Signed-off-by: Junio C Hamano

Merge branch 'mr/doc-clean-f-f' into maint

2015-03-14T05:56:12Z

Documentation update. * mr/doc-clean-f-f: Documentation/git-clean.txt: document that -f may need to be given twice

Merge branch 'mg/doc-remote-tags-or-not' into maint

2015-03-14T05:56:05Z

"git remote add" mentioned "--tags" and "--no-tags" and was not clear that fetch from the remote in the future will use the default behaviour when neither is given to override it. * mg/doc-remote-tags-or-not: git-remote.txt: describe behavior without --tags and --no-tags

Merge branch 'ms/submodule-update-config-doc' into maint

2015-03-14T05:56:03Z

The interaction between "git submodule update" and the submodule.*.update configuration was not clearly documented. * ms/submodule-update-config-doc: submodule: improve documentation of update subcommand

Merge branch 'jc/apply-beyond-symlink' into maint

2015-03-14T05:56:02Z

"git apply" was not very careful about reading from, removing, updating and creating paths outside the working tree (under --index/--cached) or the current directory (when used as a replacement for GNU patch). * jc/apply-beyond-symlink: apply: do not touch a file beyond a symbolic link apply: do not read from beyond a symbolic link apply: do not read from the filesystem under --index apply: reject input that touches outside the working area

Git 2.3.2

2015-03-06T22:58:14Z

Signed-off-by: Junio C Hamano

Merge branch 'mm/am-c-doc' into maint

2015-03-06T22:57:56Z

The configuration variable 'mailinfo.scissors' was hard to discover in the documentation. * mm/am-c-doc: Documentation/git-am.txt: mention mailinfo.scissors config variable Documentation/config.txt: document mailinfo.scissors

Prepare for 2.3.2

2015-03-05T21:15:53Z

Merge branch 'jc/conf-var-doc' into maint

2015-03-05T21:13:05Z

Longstanding configuration variable naming rules has been added to the documentation. * jc/conf-var-doc: CodingGuidelines: describe naming rules for configuration variables config.txt: mark deprecated variables more prominently config.txt: clarify that add.ignore-errors is deprecated

Merge branch 'jc/remote-set-url-doc' into maint

2015-03-05T21:13:03Z

Clarify in the documentation that "remote..pushURL" and "remote..URL" are there to name the same repository accessed via different transports, not two separate repositories. * jc/remote-set-url-doc: Documentation/git-remote.txt: stress that set-url is not for triangular