git/Documentation, branch v2.3.4

Git 2.3.4

2015-03-23T18:27:27Z

Signed-off-by: Junio C Hamano

Merge branch 'mg/doc-status-color-slot' into maint

2015-03-23T18:23:31Z

Documentation fixes. * mg/doc-status-color-slot: config,completion: add color.status.unmerged

Merge branch 'jc/decorate-leaky-separator-color' into maint

2015-03-23T18:23:28Z

"git log --decorate" did not reset colors correctly around the branch names. * jc/decorate-leaky-separator-color: log --decorate: do not leak "commit" color into the next item Documentation/config.txt: simplify boolean description in the syntax section Documentation/config.txt: describe 'color' value type in the "Values" section Documentation/config.txt: have a separate "Values" section Documentation/config.txt: describe the structure first and then meaning Documentation/config.txt: explain multi-valued variables once Documentation/config.txt: avoid unnecessary negation

Merge branch 'km/imap-send-libcurl-options' into maint

2015-03-23T18:23:23Z

"git imap-send" learned to optionally talk with an IMAP server via libcURL; because there is no other option when Git is built with NO_OPENSSL option, use that codepath by default under such configuration. * km/imap-send-libcurl-options: imap-send: use cURL automatically when NO_OPENSSL defined

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

config,completion: add color.status.unmerged

2015-03-10T22:27:59Z

Reported-by: "Mladen B." Signed-off-by: Michael J Gruber Signed-off-by: Junio C Hamano