Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Revert "Merge branch 'nd/exclusion-regression-fix'" | Junio C Hamano | 2016-03-18 | 2 | -155/+5 |
* | git-svn: fix URL canonicalization during init w/ SVN 1.7+ | Eric Wong | 2016-03-16 | 1 | -1/+1 |
* | t9117: test specifying full url to git svn init -T | Adam Dinwoodie | 2016-03-16 | 1 | -0/+6 |
* | git-svn: shorten glob error message | Eric Wong | 2016-03-15 | 3 | -9/+16 |
* | git-svn: loosen config globs limitations | Victor Leschuk | 2016-03-15 | 1 | -0/+222 |
* | Merge branch 'js/close-packs-before-gc' | Junio C Hamano | 2016-03-10 | 1 | -4/+6 |
|\ | |||||
| * | t5510: do not leave changed cwd | Michael J Gruber | 2016-03-04 | 1 | -4/+6 |
* | | Merge branch 'nd/clear-gitenv-upon-use-of-alias' | Junio C Hamano | 2016-03-04 | 1 | -11/+9 |
|\ \ | |||||
| * | | t0001: fix GIT_* environment variable check under --valgrindnd/clear-gitenv-upon-use-of-alias | Johannes Sixt | 2016-03-03 | 1 | -11/+9 |
* | | | Merge branch 'jk/pack-idx-corruption-safety' | Junio C Hamano | 2016-03-04 | 1 | -0/+179 |
|\ \ \ | |||||
| * | | | use_pack: handle signed off_t overflow | Jeff King | 2016-02-25 | 1 | -1/+1 |
| * | | | nth_packed_object_offset: bounds-check extended offset | Jeff King | 2016-02-25 | 1 | -1/+1 |
| * | | | t5313: test bounds-checks of corrupted/malicious pack/idx files | Jeff King | 2016-02-25 | 1 | -0/+179 |
* | | | | Merge branch 'mg/httpd-tests-update-for-apache-2.4' | Junio C Hamano | 2016-03-04 | 1 | -0/+3 |
|\ \ \ \ | |||||
| * | | | | t/lib-httpd: load mod_unixdmg/httpd-tests-update-for-apache-2.4 | Michael J Gruber | 2016-02-25 | 1 | -0/+3 |
* | | | | | Merge branch 'js/mingw-tests' | Junio C Hamano | 2016-03-04 | 1 | -1/+7 |
|\ \ \ \ \ | |||||
| * | | | | | t9700: fix test for perl older than 5.14js/mingw-tests | Jeff King | 2016-03-04 | 1 | -1/+7 |
* | | | | | | Merge branch 'mm/readme-markdown' | Junio C Hamano | 2016-02-26 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | README: use markdown syntax | Matthieu Moy | 2016-02-25 | 1 | -1/+1 |
* | | | | | | | Merge branch 'js/config-set-in-non-repository' | Junio C Hamano | 2016-02-26 | 1 | -0/+11 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | git config: report when trying to modify a non-existing repo configjs/config-set-in-non-repository | Johannes Schindelin | 2016-02-25 | 1 | -0/+11 |
* | | | | | | | | Merge branch 'jk/epipe-in-async' | Junio C Hamano | 2016-02-26 | 2 | -2/+5 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | t5504: handle expected output from SIGPIPE deathjk/epipe-in-async | Jeff King | 2016-02-25 | 1 | -1/+4 |
| * | | | | | | | | test_must_fail: report number of unexpected signal | Jeff King | 2016-02-25 | 1 | -1/+1 |
| |/ / / / / / / | |||||
| * | | | | | | | Merge branch 'js/test-lib-windows-emulated-yes' into maint | Junio C Hamano | 2016-02-17 | 1 | -2/+4 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'aw/push-force-with-lease-reporting' into maint | Junio C Hamano | 2016-02-17 | 1 | -5/+10 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'js/xmerge-marker-eol' into maint | Junio C Hamano | 2016-02-17 | 1 | -0/+13 |
| |\ \ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ \ | Merge branch 'fa/merge-recursive-no-rename' | Junio C Hamano | 2016-02-26 | 2 | -1/+313 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | t3034: test deprecated interfacefa/merge-recursive-no-rename | Felipe Gonçalves Assis | 2016-02-24 | 1 | -0/+46 |
| * | | | | | | | | | | | t3034: test option to disable renames | Felipe Gonçalves Assis | 2016-02-24 | 1 | -0/+28 |
| * | | | | | | | | | | | t3034: add rename threshold tests | Felipe Gonçalves Assis | 2016-02-24 | 2 | -1/+239 |
* | | | | | | | | | | | | Merge branch 'sb/submodule-module-list-fix' | Junio C Hamano | 2016-02-26 | 1 | -0/+25 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | submodule helper list: respect correct path prefixsb/submodule-module-list-fix | Stefan Beller | 2016-02-24 | 1 | -0/+25 |
| |/ / / / / / / / / / / | |||||
* | | | | | | | | | | | | Merge branch 'tb/conversion' | Junio C Hamano | 2016-02-26 | 1 | -142/+172 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | convert.c: correct attr_action()tb/conversion | Torsten Bögershausen | 2016-02-23 | 1 | -7/+26 |
| * | | | | | | | | | | | | t0027: add tests for get_stream_filter() | Torsten Bögershausen | 2016-02-08 | 1 | -135/+146 |
* | | | | | | | | | | | | | Merge branch 'jk/grep-binary-workaround-in-test' | Junio C Hamano | 2016-02-26 | 2 | -13/+17 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | t9200: avoid grep on non-ASCII datajk/grep-binary-workaround-in-test | John Keeping | 2016-02-23 | 1 | -1/+1 |
| * | | | | | | | | | | | | | t8005: avoid grep on non-ASCII data | John Keeping | 2016-02-23 | 1 | -12/+16 |
| | |_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Merge branch 'ps/config-error' | Junio C Hamano | 2016-02-26 | 2 | -1/+24 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | remote: die on config error when setting URL | Patrick Steinhardt | 2016-02-22 | 1 | -0/+9 |
| * | | | | | | | | | | | | | branch: die on config error when unsetting upstream | Patrick Steinhardt | 2016-02-22 | 1 | -0/+7 |
| * | | | | | | | | | | | | | branch: report errors in tracking branch setup | Patrick Steinhardt | 2016-02-22 | 1 | -1/+8 |
| | |_|_|/ / / / / / / / / | |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Merge branch 'sg/t6050-failing-editor-test-fix' into maint | Junio C Hamano | 2016-02-05 | 1 | -3/+7 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/ref-cache-non-repository-optim' into maint | Junio C Hamano | 2016-02-05 | 2 | -0/+11 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'js/dirname-basename' into maint | Junio C Hamano | 2016-02-05 | 1 | -0/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'nd/diff-with-path-params' into maint | Junio C Hamano | 2016-02-05 | 1 | -0/+6 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/list-tag-2.7-regression' into maint | Junio C Hamano | 2016-02-05 | 3 | -52/+38 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/sanity' into maint | Junio C Hamano | 2016-02-05 | 1 | -5/+13 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/filter-branch-no-index' into maint | Junio C Hamano | 2016-02-05 | 1 | -0/+8 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |