git/contrib, branch v2.6.2

Merge branch 'pt/pull-builtin' into maint

2015-10-16T21:32:32Z

* pt/pull-builtin: pull: enclose in brackets in the usage string merge: grammofix in please-commit-before-merge message

merge: grammofix in please-commit-before-merge message

2015-10-02T21:29:56Z

Signed-off-by: Alex Henrie Signed-off-by: Junio C Hamano

Merge branch 'js/maint-am-skip-performance-regression'

2015-09-14T21:59:13Z

Recent versions of scripted "git am" has a performance regression in "git am --skip" codepath, which no longer exists in the built-in version on the 'master' front. Fix the regression in the last scripted version that appear in 2.5.x maintenance track and older. * js/maint-am-skip-performance-regression: am --skip/--abort: merge HEAD/ORIG_HEAD tree into index

Merge branch 'sg/config-name-only'

2015-08-31T22:38:50Z

"git config --list" output was hard to parse when values consist of multiple lines. "--name-only" option is added to help this. * sg/config-name-only: get_urlmatch: avoid useless strbuf write format_config: simplify buffer handling format_config: don't init strbuf config: restructure format_config() for better control flow completion: list variable names reliably with 'git config --name-only' config: add '--name-only' option to list only variable names

Merge branch 'ep/http-configure-ssl-version'

2015-08-26T22:45:31Z

A new configuration variable http.sslVersion can be used to specify what specific version of SSL/TLS to use to make a connection. * ep/http-configure-ssl-version: http: add support for specifying the SSL version

Sync with maint

2015-08-25T23:09:30Z

* maint: pull: pass upload_pack only when it was given

Merge branch 'tb/complete-rebase-i-edit-todo'

2015-08-19T21:48:56Z

The command-line completion script (in contrib/) has been updated. * tb/complete-rebase-i-edit-todo: completion: offer '--edit-todo' during interactive rebase

Merge branch 'jk/git-path'

2015-08-19T21:48:56Z

git_path() and mkpath() are handy helper functions but it is easy to misuse, as the callers need to be careful to keep the number of active results below 4. Their uses have been reduced. * jk/git-path: memoize common git-path "constant" files get_repo_path: refactor path-allocation find_hook: keep our own static buffer refs.c: remove_empty_directories can take a strbuf refs.c: avoid git_path assignment in lock_ref_sha1_basic refs.c: avoid repeated git_path calls in rename_tmp_log refs.c: simplify strbufs in reflog setup and writing path.c: drop git_path_submodule refs.c: remove extra git_path calls from read_loose_refs remote.c: drop extraneous local variable from migrate_file prefer mkpathdup to mkpath in assignments prefer git_pathdup to git_path in some possibly-dangerous cases add_to_alternates_file: don't add duplicate entries t5700: modernize style cache.h: complete set of git_path_submodule helpers cache.h: clarify documentation for git_path, et al

Merge branch 'mm/pull-upload-pack'

2015-08-19T21:48:51Z

"git pull" in recent releases of Git has a regression in the code that allows custom path to the --upload-pack=. This has been corrected. Note that this is irrelevant for 'master' with "git pull" rewritten in C. * mm/pull-upload-pack: pull.sh: quote $upload_pack when passing it to git-fetch

Merge branch 'da/subtree-date-confusion' into maint

2015-08-19T21:41:25Z

"git subtree" (in contrib/) depended on "git log" output to be stable, which was a no-no. Apply a workaround to force a particular date format. * da/subtree-date-confusion: contrib/subtree: ignore log.date configuration