git, branch v2.18.0

Git 2.18

2018-06-21T17:00:06Z

Signed-off-by: Junio C Hamano

Merge branch 'en/rename-directory-detection-reboot'

2018-06-19T18:11:03Z

* en/rename-directory-detection-reboot: merge-recursive: use xstrdup() instead of fixed buffer

Merge tag 'l10n-2.18.0-rnd3.1' of git://github.com/git-l10n/git-po

2018-06-19T16:29:23Z

Merge Korean translation for l10n of Git 2.18.0 round 3 * tag 'l10n-2.18.0-rnd3.1' of git://github.com/git-l10n/git-po: l10n: ko.po: Update Korean translation

Merge branch 'cf/submodule-progress-dissociate'

2018-06-19T16:26:59Z

* cf/submodule-progress-dissociate: t7400: encapsulate setup code in test_expect_success

Merge branch 'js/rebase-i-root-fix'

2018-06-19T16:26:28Z

* js/rebase-i-root-fix: t3404: check root commit in 'rebase -i --root reword root commit'

t7400: encapsulate setup code in test_expect_success

2018-06-19T16:25:56Z

When running t7400 in a shell you observe more output than expected: ... ok 8 - setup - hide init subdirectory ok 9 - setup - repository to add submodules to ok 10 - submodule add [master (root-commit) d79ce16] one Author: A U Thor 1 file changed, 1 insertion(+) create mode 100644 one.t ok 11 - redirected submodule add does not show progress ok 12 - redirected submodule add --progress does show progress ok 13 - submodule add to .gitignored path fails ... Fix the output by encapsulating the setup code in test_expect_success Signed-off-by: Stefan Beller Signed-off-by: Junio C Hamano

t3404: check root commit in 'rebase -i --root reword root commit'

2018-06-19T16:14:33Z

When testing a reworded root commit, ensure that the squash-onto commit which is created and amended is still the root commit. Suggested-by: Phillip Wood Helped-by: Johannes Schindelin Signed-off-by: Todd Zullinger Signed-off-by: Junio C Hamano

doc: fix typos in documentation and release notes

2018-06-19T16:01:12Z

Signed-off-by: Karthikeyan Singaravelan Signed-off-by: Junio C Hamano

Almost 2.18 final

2018-06-18T18:24:21Z

Signed-off-by: Junio C Hamano

Merge branch 'es/make-no-iconv'

2018-06-18T18:23:24Z

"make NO_ICONV=NoThanks" did not override NEEDS_LIBICONV (i.e. linkage of -lintl, -liconv, etc. that are platform-specific tweaks), which has been corrected. * es/make-no-iconv: Makefile: make NO_ICONV really mean "no iconv"