summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* t2202: make sure "git add" (no args) stays a no-opjc/simple-add-must-be-a-no-opJunio C Hamano2013-07-191-0/+10
* Start preparing for 1.8.3.4Junio C Hamano2013-07-192-1/+16
* apply.c::find_name_traditional(): do not initialize len to the line's lengthStefan Beller2013-07-191-1/+1
* http-push.c::add_send_request(): do not initialize transfer_requestStefan Beller2013-07-191-1/+1
* Merge branch 'tr/test-lint-no-export-assignment-in-shell' into maintJunio C Hamano2013-07-192-1/+2
|\
| * test-lint: detect 'export FOO=bar'Thomas Rast2013-07-081-0/+1
| * t9902: fix 'test A == B' to use = operatorThomas Rast2013-07-081-1/+1
* | Merge branch 'rr/name-rev-stdin-doc' into maintJunio C Hamano2013-07-191-2/+4
|\ \
| * | name-rev doc: rewrite --stdin paragraphRamkumar Ramachandra2013-07-071-2/+4
* | | Merge branch 'ft/diff-rename-default-score-is-half' into maintJunio C Hamano2013-07-191-1/+1
|\ \ \
| * | | diff-options: document default similarity indexFraser Tweedale2013-07-051-1/+1
* | | | Merge branch 'jc/t1512-fix' into maintJunio C Hamano2013-07-192-11/+23
|\ \ \ \
| * | | | get_short_sha1(): correctly disambiguate type-limited abbreviationJunio C Hamano2013-07-011-1/+1
| * | | | t1512: correct leftover constants from earlier editionJunio C Hamano2013-07-011-10/+22
* | | | | Merge branch 'vl/typofix' into maintJunio C Hamano2013-07-193-3/+3
|\ \ \ \ \
| * | | | | random typofixes (committed missing a 't', successful missing an 's')Veres Lajos2013-06-193-3/+3
* | | | | | Merge branch 'wk/doc-git-has-grown' into maintJunio C Hamano2013-07-191-3/+3
|\ \ \ \ \ \
| * | | | | | user-manual: Update download size for Git and the kernelW. Trevor King2013-06-231-3/+3
| |/ / / / /
* | | | | | Merge branch 'ys/cygstart' into maintJunio C Hamano2013-07-192-3/+9
|\ \ \ \ \ \
| * | | | | | 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