Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'vl/typofix' into maint | Junio C Hamano | 2013-07-19 | 3 | -3/+3 |
|\ | |||||
| * | random typofixes (committed missing a 't', successful missing an 's') | Veres Lajos | 2013-06-19 | 3 | -3/+3 |
* | | Merge branch 'wk/doc-git-has-grown' into maint | Junio C Hamano | 2013-07-19 | 1 | -3/+3 |
|\ \ | |||||
| * | | user-manual: Update download size for Git and the kernel | W. Trevor King | 2013-06-23 | 1 | -3/+3 |
| |/ | |||||
* | | Merge branch 'ys/cygstart' into maint | Junio C Hamano | 2013-07-19 | 2 | -3/+9 |
|\ \ | |||||
| * | | web--browse: support /usr/bin/cygstart on Cygwin | Yaakov Selkowitz | 2013-06-21 | 2 | -3/+9 |
* | | | Merge branch 'mm/push-force-is-dangerous' into maint | Junio C Hamano | 2013-07-19 | 1 | -0/+9 |
|\ \ \ | |||||
| * | | | Documentation/git-push.txt: explain better cases where --force is dangerous | Matthieu Moy | 2013-06-18 | 1 | -0/+9 |
* | | | | Merge branch 'rs/logical-vs-binary-or' into maint | Junio C Hamano | 2013-07-19 | 3 | -6/+6 |
|\ \ \ \ | |||||
| * | | | | use logical OR (||) instead of binary OR (|) in logical context | René Scharfe | 2013-06-13 | 3 | -6/+6 |
* | | | | | Merge branch 'js/test-ln-s-add' into maint | Junio C Hamano | 2013-07-19 | 30 | -333/+351 |
|\ \ \ \ \ | |||||
| * | | | | | t4011: remove SYMLINKS prerequisite | Johannes Sixt | 2013-06-07 | 1 | -10/+25 |
| * | | | | | t6035: use test_ln_s_add to remove SYMLINKS prerequisite | Johannes Sixt | 2013-06-07 | 1 | -26/+47 |
| * | | | | | t3509, t4023, t4114: use test_ln_s_add to remove SYMLINKS prerequisite | Johannes Sixt | 2013-06-07 | 3 | -36/+33 |
| * | | | | | t3100: use test_ln_s_add to remove SYMLINKS prerequisite | Johannes Sixt | 2013-06-07 | 1 | -27/+15 |
| * | | | | | t3030: use test_ln_s_add to remove SYMLINKS prerequisite | Johannes Sixt | 2013-06-07 | 1 | -36/+26 |
| * | | | | | t0000: use test_ln_s_add to remove SYMLINKS prerequisite | Johannes Sixt | 2013-06-07 | 1 | -29/+10 |
| * | | | | | tests: use test_ln_s_add to remove SYMLINKS prerequisite (trivial cases) | Johannes Sixt | 2013-06-07 | 19 | -110/+106 |
| * | | | | | tests: introduce test_ln_s_add | Johannes Sixt | 2013-06-07 | 2 | -0/+31 |
| * | | | | | t3010: modernize style | Johannes Sixt | 2013-06-07 | 1 | -62/+61 |
| * | | | | | test-chmtime: Fix exit code on Windows | Johannes Sixt | 2013-06-02 | 1 | -4/+4 |
* | | | | | | Merge branch 'jk/apache-test-for-2.4' into maint | Junio C Hamano | 2013-07-19 | 1 | -1/+19 |
|\ \ \ \ \ \ | |||||
| * | | | | | | lib-httpd/apache.conf: check version only after mod_version loads | Jeff King | 2013-06-21 | 1 | -3/+4 |
| * | | | | | | t/lib-httpd/apache.conf: configure an MPM module for apache 2.4 | Jeff King | 2013-06-14 | 1 | -0/+3 |
| * | | | | | | t/lib-httpd/apache.conf: load compat access module in apache 2.4 | Jeff King | 2013-06-14 | 1 | -0/+3 |
| * | | | | | | t/lib-httpd/apache.conf: load extra auth modules in apache 2.4 | Jeff King | 2013-06-14 | 1 | -0/+9 |
| * | | | | | | t/lib-httpd/apache.conf: do not use LockFile in apache >= 2.4 | Jeff King | 2013-06-14 | 1 | -0/+2 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Merge branch 'tr/test-commit-only-on-orphan' into maint | Junio C Hamano | 2013-07-19 | 1 | -0/+13 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Test 'commit --only' after 'checkout --orphan' | Thomas Rast | 2013-06-02 | 1 | -0/+13 |
* | | | | | | | Merge branch 'sb/archive-zip-double-assignment-fix' into maint | Junio C Hamano | 2013-07-19 | 1 | -1/+0 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | archive-zip:write_zip_entry: Remove second reset of size variable to zero. | Stefan Beller | 2013-05-29 | 1 | -1/+0 |
* | | | | | | | | Merge branch 'th/bisect-skip-report-range-fix' into maint | Junio C Hamano | 2013-07-19 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | bisect: Fix log output for multi-parent skip ranges | Torstein Hegge | 2013-05-22 | 1 | -2/+2 |
* | | | | | | | | | Merge branch 'rs/tar-tests' into maint | Junio C Hamano | 2013-07-19 | 3 | -78/+92 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | t5000: test long filenames | René Scharfe | 2013-05-20 | 2 | -0/+46 |
| * | | | | | | | | | t5000: simplify tar-tree tests | René Scharfe | 2013-05-20 | 1 | -23/+8 |
| * | | | | | | | | | t5000: use check_tar for prefix test | René Scharfe | 2013-05-20 | 1 | -12/+12 |
| * | | | | | | | | | t5000: factor out check_tar | René Scharfe | 2013-05-20 | 1 | -13/+22 |
| * | | | | | | | | | t5000, t5003: create directories for extracted files lazily | René Scharfe | 2013-05-20 | 2 | -4/+4 |
| * | | | | | | | | | t5000: integrate export-subst tests into regular tests | René Scharfe | 2013-05-20 | 1 | -32/+6 |
* | | | | | | | | | | Merge branch 'rr/column-doc' into maint | Junio C Hamano | 2013-07-19 | 1 | -3/+17 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | column doc: rewrite documentation for column.ui | Ramkumar Ramachandra | 2013-06-26 | 1 | -3/+17 |
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'rs/discard-index-discard-array' into maint | Junio C Hamano | 2013-07-19 | 5 | -2/+32 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | read-cache: free cache in discard_index | René Scharfe | 2013-06-09 | 1 | -2/+3 |
| * | | | | | | | | | | read-cache: add simple performance test | René Scharfe | 2013-06-09 | 4 | -0/+29 |
| | |_|_|_|_|_|/ / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'tr/coverage' into maint | Junio C Hamano | 2013-07-19 | 1 | -8/+13 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | coverage: build coverage-untested-functions by default | Thomas Rast | 2013-05-13 | 1 | -1/+1 |
| * | | | | | | | | | | coverage: set DEFAULT_TEST_TARGET to avoid using prove | Thomas Rast | 2013-05-13 | 1 | -1/+1 |
| * | | | | | | | | | | coverage: do not delete .gcno files before building | Thomas Rast | 2013-05-13 | 1 | -3/+6 |
| * | | | | | | | | | | coverage: split build target into compile and test | Thomas Rast | 2013-05-13 | 1 | -3/+5 |