summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | | | | Merge branch 'jk/epipe-in-async' into maintJunio C Hamano2016-03-106-3/+25
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ps/config-error' into maintJunio C Hamano2016-03-1013-105/+159
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mg/work-tree-tests' into maintJunio C Hamano2016-03-103-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sp/remote-curl-ssl-strerror' into maintJunio C Hamano2016-03-101-2/+14
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jx/http-no-proxy'Junio C Hamano2016-03-101-0/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | http: honor no_http env variable to bypass proxyjx/http-no-proxyJiang Xin2016-02-291-0/+6
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/exclusion-doc'Junio C Hamano2016-03-101-1/+37
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | gitignore: document that unignoring a directory unignores everything in itjc/exclusion-docJunio C Hamano2016-03-081-1/+37
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/close-packs-before-gc'Junio C Hamano2016-03-101-4/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | t5510: do not leave changed cwdMichael J Gruber2016-03-041-4/+6
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'sb/rebase-summary'Junio C Hamano2016-03-101-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Documentation: reword rebase summarysb/rebase-summaryStefan Beller2016-03-021-1/+1
| | |_|_|/ / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | Git 2.8-rc1v2.8.0-rc1Junio C Hamano2016-03-042-1/+13
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'nd/clear-gitenv-upon-use-of-alias'Junio C Hamano2016-03-041-11/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | t0001: fix GIT_* environment variable check under --valgrindnd/clear-gitenv-upon-use-of-aliasJohannes Sixt2016-03-031-11/+9
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/pthread-exit-emu-windows'Junio C Hamano2016-03-041-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Mark win32's pthread_exit() as NORETURNjs/pthread-exit-emu-windowsJohannes Schindelin2016-03-021-1/+1
| | |/ / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'sb/submodule-parallel-fetch'Junio C Hamano2016-03-044-32/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | run-command: do not pass child process data into callbacksStefan Beller2016-03-014-32/+9
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/tighten-alloc'Junio C Hamano2016-03-041-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | compat/mingw: brown paper bag fix for 50a6c8eJeff King2016-02-291-1/+1
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'nd/i18n-2.8.0'Junio C Hamano2016-03-044-21/+21
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | trailer.c: mark strings for translationnd/i18n-2.8.0Nguyễn Thái Ngọc Duy2016-02-291-1/+1
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | ref-filter.c: mark strings for translationNguyễn Thái Ngọc Duy2016-02-291-14/+14
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | builtin/clone.c: mark strings for translationNguyễn Thái Ngọc Duy2016-02-291-5/+5
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | builtin/checkout.c: mark strings for translationNguyễn Thái Ngọc Duy2016-02-291-1/+1
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'tb/avoid-gcc-on-darwin-10-6'Junio C Hamano2016-03-041-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | config.mak.uname: use clang for Mac OS X 10.6Torsten Bögershausen2016-02-281-0/+3
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/pack-idx-corruption-safety'Junio C Hamano2016-03-044-0/+207
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | sha1_file.c: mark strings for translationNguyễn Thái Ngọc Duy2016-02-271-3/+3
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | use_pack: handle signed off_t overflowJeff King2016-02-252-1/+3
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | nth_packed_object_offset: bounds-check extended offsetJeff King2016-02-254-1/+27
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | t5313: test bounds-checks of corrupted/malicious pack/idx filesJeff King2016-02-251-0/+179
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'mg/httpd-tests-update-for-apache-2.4'Junio C Hamano2016-03-041-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | t/lib-httpd: load mod_unixdmg/httpd-tests-update-for-apache-2.4Michael J Gruber2016-02-251-0/+3
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/mingw-tests'Junio C Hamano2016-03-041-1/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t9700: fix test for perl older than 5.14js/mingw-testsJeff King2016-03-041-1/+7
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | documentation: fix some typosThomas Ackermann2016-03-032-2/+2
| |_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Git 2.8-rc0v2.8.0-rc0Junio C Hamano2016-02-262-1/+96
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'mm/readme-markdown'Junio C Hamano2016-02-262-26/+32
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | README.md: move down historical explanation about the nameMatthieu Moy2016-02-251-11/+13
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | README.md: don't call git stupid in the titleMatthieu Moy2016-02-251-2/+2
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | README.md: move the link to git-scm.com upMatthieu Moy2016-02-251-3/+3
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | README.md: add hyperlinks on filenamesMatthieu Moy2016-02-251-6/+13
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | README: use markdown syntaxMatthieu Moy2016-02-252-6/+3
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ma/update-hooks-sample-typofix'Junio C Hamano2016-02-261-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | templates/hooks: fix minor typo in the sample update-hookma/update-hooks-sample-typofixMartin Amdisen2016-02-251-1/+1
| | |_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ls/makefile-cflags-developer-tweak'Junio C Hamano2016-02-263-1/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add DEVELOPER makefile knob to check for acknowledged warningsls/makefile-cflags-developer-tweakLars Schneider2016-02-253-1/+18
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'dt/initial-ref-xn-commit-doc'Junio C Hamano2016-02-261-0/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | |