summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | web--browse: support /usr/bin/cygstart on CygwinYaakov Selkowitz2013-06-212-3/+9
| | |_|_|_|_|_|_|/ / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'mm/push-force-is-dangerous' into maintJunio C Hamano2013-07-191-0/+9
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Documentation/git-push.txt: explain better cases where --force is dangerousMatthieu Moy2013-06-181-0/+9
| | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'rs/logical-vs-binary-or' into maintJunio C Hamano2013-07-193-6/+6
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | use logical OR (||) instead of binary OR (|) in logical contextRené Scharfe2013-06-133-6/+6
* | | | | | | | | | | | Merge branch 'js/test-ln-s-add' into maintJunio C Hamano2013-07-1930-333/+351
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | t4011: remove SYMLINKS prerequisiteJohannes Sixt2013-06-071-10/+25
| * | | | | | | | | | | | t6035: use test_ln_s_add to remove SYMLINKS prerequisiteJohannes Sixt2013-06-071-26/+47
| * | | | | | | | | | | | t3509, t4023, t4114: use test_ln_s_add to remove SYMLINKS prerequisiteJohannes Sixt2013-06-073-36/+33
| * | | | | | | | | | | | t3100: use test_ln_s_add to remove SYMLINKS prerequisiteJohannes Sixt2013-06-071-27/+15
| * | | | | | | | | | | | t3030: use test_ln_s_add to remove SYMLINKS prerequisiteJohannes Sixt2013-06-071-36/+26
| * | | | | | | | | | | | t0000: use test_ln_s_add to remove SYMLINKS prerequisiteJohannes Sixt2013-06-071-29/+10
| * | | | | | | | | | | | tests: use test_ln_s_add to remove SYMLINKS prerequisite (trivial cases)Johannes Sixt2013-06-0719-110/+106
| * | | | | | | | | | | | tests: introduce test_ln_s_addJohannes Sixt2013-06-072-0/+31
| * | | | | | | | | | | | t3010: modernize styleJohannes Sixt2013-06-071-62/+61
| * | | | | | | | | | | | test-chmtime: Fix exit code on WindowsJohannes Sixt2013-06-021-4/+4
* | | | | | | | | | | | | Merge branch 'jk/apache-test-for-2.4' into maintJunio C Hamano2013-07-191-1/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | lib-httpd/apache.conf: check version only after mod_version loadsJeff King2013-06-211-3/+4
| * | | | | | | | | | | | | t/lib-httpd/apache.conf: configure an MPM module for apache 2.4Jeff King2013-06-141-0/+3
| * | | | | | | | | | | | | t/lib-httpd/apache.conf: load compat access module in apache 2.4Jeff King2013-06-141-0/+3
| * | | | | | | | | | | | | t/lib-httpd/apache.conf: load extra auth modules in apache 2.4Jeff King2013-06-141-0/+9
| * | | | | | | | | | | | | t/lib-httpd/apache.conf: do not use LockFile in apache >= 2.4Jeff King2013-06-141-0/+2
| | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'tr/test-commit-only-on-orphan' into maintJunio C Hamano2013-07-191-0/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Test 'commit --only' after 'checkout --orphan'Thomas Rast2013-06-021-0/+13
* | | | | | | | | | | | | | Merge branch 'sb/archive-zip-double-assignment-fix' into maintJunio C Hamano2013-07-191-1/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | archive-zip:write_zip_entry: Remove second reset of size variable to zero.Stefan Beller2013-05-291-1/+0
* | | | | | | | | | | | | | | Merge branch 'th/bisect-skip-report-range-fix' into maintJunio C Hamano2013-07-191-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | bisect: Fix log output for multi-parent skip rangesTorstein Hegge2013-05-221-2/+2
* | | | | | | | | | | | | | | | Merge branch 'rs/tar-tests' into maintJunio C Hamano2013-07-193-78/+92
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | t5000: test long filenamesRené Scharfe2013-05-202-0/+46
| * | | | | | | | | | | | | | | | t5000: simplify tar-tree testsRené Scharfe2013-05-201-23/+8
| * | | | | | | | | | | | | | | | t5000: use check_tar for prefix testRené Scharfe2013-05-201-12/+12
| * | | | | | | | | | | | | | | | t5000: factor out check_tarRené Scharfe2013-05-201-13/+22
| * | | | | | | | | | | | | | | | t5000, t5003: create directories for extracted files lazilyRené Scharfe2013-05-202-4/+4
| * | | | | | | | | | | | | | | | t5000: integrate export-subst tests into regular testsRené Scharfe2013-05-201-32/+6
* | | | | | | | | | | | | | | | | Merge branch 'rr/column-doc' into maintJunio C Hamano2013-07-191-3/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | column doc: rewrite documentation for column.uiRamkumar Ramachandra2013-06-261-3/+17
| | |_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'rs/discard-index-discard-array' into maintJunio C Hamano2013-07-195-2/+32
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | read-cache: free cache in discard_indexRené Scharfe2013-06-091-2/+3
| * | | | | | | | | | | | | | | | | read-cache: add simple performance testRené Scharfe2013-06-094-0/+29
| | |_|_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'tr/coverage' into maintJunio C Hamano2013-07-191-8/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | coverage: build coverage-untested-functions by defaultThomas Rast2013-05-131-1/+1
| * | | | | | | | | | | | | | | | | coverage: set DEFAULT_TEST_TARGET to avoid using proveThomas Rast2013-05-131-1/+1
| * | | | | | | | | | | | | | | | | coverage: do not delete .gcno files before buildingThomas Rast2013-05-131-3/+6
| * | | | | | | | | | | | | | | | | coverage: split build target into compile and testThomas Rast2013-05-131-3/+5
* | | | | | | | | | | | | | | | | | Documentation: "git reset <tree-ish> <pathspec>" takes a tree-ish, not tree-shStefan Beller2013-07-191-1/+1
* | | | | | | | | | | | | | | | | | Git 1.8.3.3v1.8.3.3Junio C Hamano2013-07-153-2/+24
* | | | | | | | | | | | | | | | | | Merge branch 'tr/maint-apply-non-git-patch-parsefix' into maintJunio C Hamano2013-07-152-1/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | apply: carefully strdup a possibly-NULL nameThomas Rast2013-06-212-1/+15
* | | | | | | | | | | | | | | | | | | Merge branch 'bc/http-keep-memory-given-to-curl' into maintJunio C Hamano2013-07-151-3/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \