summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'sb/submodule-parallel-fetch'Junio C Hamano2016-01-1215-74/+731
|\
| * submodules: allow parallel fetching, add tests and documentationStefan Beller2015-12-166-4/+40
| * fetch_populated_submodules: use new parallel job processingStefan Beller2015-12-161-44/+98
| * run-command: add an asynchronous parallel child processorStefan Beller2015-12-164-1/+522
| * sigchain: add command to pop all common signalsStefan Beller2015-12-162-0/+10
| * strbuf: add strbuf_read_once to read without blockingStefan Beller2015-12-162-0/+19
| * xread: poll on non blocking fdsStefan Beller2015-12-161-2/+18
| * submodule.c: write "Fetching submodule <foo>" to stderrJonathan Nieder2015-12-162-26/+27
* | Merge branch 'ps/push-delete-option'Junio C Hamano2016-01-122-2/+2
|\ \
| * | push: add '-d' as shorthand for '--delete'ps/push-delete-optionPatrick Steinhardt2015-12-162-2/+2
| * | push: add '--delete' flag to synopsisPatrick Steinhardt2015-12-141-1/+1
| |/
* | Merge branch 'ep/make-phoney'Junio C Hamano2016-01-121-0/+9
|\ \
| * | Makefile: add missing phony targetep/make-phoneyElia Pinto2015-12-161-0/+9
* | | Merge branch 'nd/stop-setenv-work-tree'Junio C Hamano2016-01-122-3/+1
|\ \ \
| * | | Revert "setup: set env $GIT_WORK_TREE when work tree is set, like $GIT_DIR"nd/stop-setenv-work-treeNguyễn Thái Ngọc Duy2015-12-222-3/+1
* | | | Git 2.7v2.7.0Junio C Hamano2016-01-042-1/+6
* | | | Sync with 2.6.5Junio C Hamano2016-01-042-1/+21
|\ \ \ \
| * | | | Git 2.6.5v2.6.5Junio C Hamano2016-01-043-2/+22
| * | | | Merge branch 'jk/pending-keep-tag-name' into maintJunio C Hamano2016-01-042-2/+30
| |\ \ \ \
| * \ \ \ \ Merge branch 'jk/symbolic-ref-maint' into maintJunio C Hamano2016-01-042-1/+23
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'jk/ident-loosen-getpwuid' into maintJunio C Hamano2016-01-043-24/+40
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'jk/send-email-ssl-errors' into maintJunio C Hamano2016-01-041-0/+7
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'sg/completion-no-column' into maintJunio C Hamano2016-01-041-0/+1
| |\ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ Merge tag 'l10n-2.7.0-rnd2+de' of git://github.com/git-l10n/git-poJunio C Hamano2016-01-021-1489/+1723
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | l10n: de.po: translate 68 new messagesRalf Thielow2015-12-291-1486/+1720
| * | | | | | | | | | l10n: de.po: improve some translationsRalf Thielow2015-12-291-3/+3
|/ / / / / / / / / /
* | | | | | | | | | Git 2.7-rc3v2.7.0-rc3Junio C Hamano2015-12-282-1/+12
* | | | | | | | | | Merge branch 'sh/p4-multi-depot'Junio C Hamano2015-12-282-26/+57
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | git-p4: reduce number of server queries for fetchessh/p4-multi-depotSam Hocevar2015-12-212-24/+22
| * | | | | | | | | | git-p4: support multiple depot paths in p4 submitSam Hocevar2015-12-211-2/+9
| * | | | | | | | | | git-p4: failing test case for skipping changes with multiple depotsLuke Diamand2015-12-141-1/+27
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
* | | | | | | | | | Merge branch 'jk/pending-keep-tag-name'Junio C Hamano2015-12-282-2/+30
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | |
| * | | | | | | | | revision.c: propagate tag names from pending arrayjk/pending-keep-tag-nameJeff King2015-12-172-2/+30
* | | | | | | | | | Merge branch 'jk/symbolic-ref-maint'Junio C Hamano2015-12-282-1/+23
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | |
| * | | | | | | | | t1401: test reflog creation for git-symbolic-refjk/symbolic-ref-maintJeff King2015-12-211-0/+16
| * | | | | | | | | symbolic-ref: propagate error code from create_symref()Jeff King2015-12-212-1/+7
* | | | | | | | | | Merge tag 'l10n-2.7.0-rnd2' of git://github.com/git-l10n/git-poJunio C Hamano2015-12-288-12723/+14731
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | l10n: ru.po: update Russian translationDimitriy Ryazantcev2015-12-281-1492/+1663
| * | | | | | | | | | Merge branch 'master' of git://github.com/alshopov/git-poJiang Xin2015-12-281-120/+119
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | l10n: Updated Bulgarian translation of git (2477t,0f,0u)Alexander Shopov2015-12-281-120/+119
| * | | | | | | | | | | l10n: ca.po: update translationAlex Henrie2015-12-271-118/+117
| |/ / / / / / / / / /
| * | | | | | | | | | l10n: zh_CN: for git v2.7.0 l10n round 2Jiang Xin2015-12-261-118/+124
| * | | | | | | | | | Merge branch 'master' of git://github.com/nafmo/git-l10n-svJiang Xin2015-12-261-120/+125
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | l10n: sv.po: Update Swedish translation (2477t0f0u)Peter Krefting2015-12-261-119/+124
| | * | | | | | | | | | l10n: sv: Fix bad translationPeter Krefting2015-12-261-1/+1
| * | | | | | | | | | | l10n: fr.po v2.7.0 round 2 (2477t)Jean-Noel Avila2015-12-241-128/+148
| |/ / / / / / / / / /
| * | | | | | | | | | l10n: git.pot: v2.7.0 round 2 (2 new, 2 removed)Jiang Xin2015-12-221-117/+116
| * | | | | | | | | | Merge branch 'master' of git://github.com/git-l10n/git-poJiang Xin2015-12-227-11022/+12831
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | l10n: zh_CN: for git v2.7.0 l10n round 1Jiang Xin2015-12-201-1444/+1669
| | * | | | | | | | | | Merge branch 'master' of git://github.com/alexhenrie/git-poJiang Xin2015-12-201-1463/+1644
| | |\ \ \ \ \ \ \ \ \ \