git, 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 'ak/t5516-typofix' into maint

2015-03-14T05:56:11Z

* ak/t5516-typofix: t5516: correct misspelled pushInsteadOf

Merge branch 'jc/diff-test-updates' into maint

2015-03-14T05:56:10Z

Test clean-up. * jc/diff-test-updates: test_ln_s_add: refresh stat info of fake symbolic links t4008: modernise style t/diff-lib: check exact object names in compare_diff_raw tests: do not borrow from COPYING and README from the real source t4010: correct expected object names t9300: correct expected object names t4008: correct stale comments

Merge branch 'jk/diffcore-rename-duplicate' into maint

2015-03-14T05:56:08Z

A corrupt input to "git diff -M" can cause us to segfault. * jk/diffcore-rename-duplicate: diffcore-rename: avoid processing duplicate destinations diffcore-rename: split locate_rename_dst into two functions

Merge branch 'bw/kwset-use-unsigned' into maint

2015-03-14T05:56:07Z

The borrowed code in kwset API did not follow our usual convention to use "unsigned char" to store values that range from 0-255. * bw/kwset-use-unsigned: kwset: use unsigned char to store values with high-bit set

Merge branch 'nd/grep-exclude-standard-help-fix' into maint

2015-03-14T05:56:06Z

Description given by "grep -h" for its --exclude-standard option was phrased poorly. * nd/grep-exclude-standard-help-fix: grep: correct help string for --exclude-standard

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 'mk/diff-shortstat-dirstat-fix' into maint

2015-03-14T05:56:04Z

"git diff --shortstat --dirstat=changes" showed a dirstat based on lines that was never asked by the end user in addition to the dirstat that the user asked for. * mk/diff-shortstat-dirstat-fix: diff --shortstat --dirstat: remove duplicate output

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