summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Git 2.8-rc2v2.8.0-rc2Junio C Hamano2016-03-102-5/+6
* Sync with 2.7.3Junio C Hamano2016-03-102-1/+64
|\
| * Git 2.7.3v2.7.3Junio C Hamano2016-03-104-3/+66
| * Merge branch 'ma/update-hooks-sample-typofix' into maintJunio C Hamano2016-03-101-1/+1
| |\
| * \ Merge branch 'dt/initial-ref-xn-commit-doc' into maintJunio C Hamano2016-03-101-0/+12
| |\ \
| * \ \ Merge branch 'ps/plug-xdl-merge-leak' into maintJunio C Hamano2016-03-101-2/+7
| |\ \ \
| * \ \ \ Merge branch 'ak/git-strip-extension-from-dashed-command' into maintJunio C Hamano2016-03-102-15/+15
| |\ \ \ \
| * \ \ \ \ Merge branch 'ak/extract-argv0-last-dir-sep' into maintJunio C Hamano2016-03-101-4/+2
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'jk/pack-idx-corruption-safety' into maintJunio C Hamano2016-03-104-0/+207
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'js/config-set-in-non-repository' into maintJunio C Hamano2016-03-102-0/+14
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'sb/submodule-module-list-fix' into maintJunio C Hamano2016-03-102-8/+27
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'jk/grep-binary-workaround-in-test' into maintJunio C Hamano2016-03-102-13/+17
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'mm/push-simple-doc' into maintJunio C Hamano2016-03-101-0/+7
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/tighten-alloc' into maintJunio C Hamano2016-03-1091-482/+441
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/more-comments-on-textconv' into maintJunio C Hamano2016-03-103-1/+24
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/no-diff-emit-common' into maintJunio C Hamano2016-03-104-57/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/am-i-v-fix' into maintJunio C Hamano2016-03-103-9/+15
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/git-common-dir-fix' into maintJunio C Hamano2016-03-102-1/+12
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/dwim-wildcards-as-pathspecs' into maintJunio C Hamano2016-03-105-33/+54
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ 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