user/sven/git.git, branch local

refs: Lookup refs in refs/pull

2016-01-17T14:30:36Z

Signed-off-by: Sven Wegener

gitweb: Use identicon gravatar as default

2016-01-17T14:30:27Z

Signed-off-by: Sven Wegener

Sync with maint

2016-01-12T23:21:00Z

* maint: l10n: ko.po: Add Korean translation

First batch for post 2.7 cycle

2016-01-12T23:20:51Z

Signed-off-by: Junio C Hamano

Merge branch 'vl/grep-configurable-threads'

2016-01-12T23:16:55Z

"git grep" can now be configured (or told from the command line) how many threads to use when searching in the working tree files. * vl/grep-configurable-threads: grep: add --threads= option and grep.threads configuration grep: slight refactoring to the code that disables threading grep: allow threading even on a single-core machine

Merge branch 'ea/blame-progress'

2016-01-12T23:16:54Z

"git blame" learned to produce the progress eye-candy when it takes too much time before emitting the first line of the result. * ea/blame-progress: blame: add support for --[no-]progress option

Merge branch 'sb/submodule-parallel-fetch'

2016-01-12T23:16:54Z

Add a framework to spawn a group of processes in parallel, and use it to run "git fetch --recurse-submodules" in parallel. Rerolled and this seems to be a lot cleaner. The merge of the earlier one to 'next' has been reverted. * sb/submodule-parallel-fetch: submodules: allow parallel fetching, add tests and documentation fetch_populated_submodules: use new parallel job processing run-command: add an asynchronous parallel child processor sigchain: add command to pop all common signals strbuf: add strbuf_read_once to read without blocking xread: poll on non blocking fds submodule.c: write "Fetching submodule " to stderr

Merge branch 'ps/push-delete-option'

2016-01-12T23:16:54Z

"branch --delete" has "branch -d" but "push --delete" does not. * ps/push-delete-option: push: add '-d' as shorthand for '--delete' push: add '--delete' flag to synopsis

Merge branch 'ep/make-phoney'

2016-01-12T23:16:53Z

A slight update to the Makefile. * ep/make-phoney: Makefile: add missing phony target

Merge branch 'nd/stop-setenv-work-tree'

2016-01-12T23:16:53Z

An earlier change in 2.5.x-era broke users' hooks and aliases by exporting GIT_WORK_TREE to point at the root of the working tree, interfering when they tried to use a different working tree without setting GIT_WORK_TREE environment themselves. * nd/stop-setenv-work-tree: Revert "setup: set env $GIT_WORK_TREE when work tree is set, like $GIT_DIR"