summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | checkout.c: change "unique" member to "num_matches"Ævar Arnfjörð Bjarmason2018-06-111-4/+4
| * | | | | checkout.c: introduce an *_INIT macroÆvar Arnfjörð Bjarmason2018-06-111-1/+3
| * | | | | checkout.h: wrap the arguments to unique_tracking_name()Ævar Arnfjörð Bjarmason2018-06-111-1/+2
| * | | | | checkout tests: index should be clean after dwim checkoutÆvar Arnfjörð Bjarmason2018-06-111-0/+29
* | | | | | Merge branch 'sb/diff-color-move-more'Junio C Hamano2018-08-037-88/+489
|\ \ \ \ \ \
| * | | | | | diff.c: offer config option to control ws handling in move detectionStefan Beller2018-07-193-2/+19
| * | | | | | diff.c: add white space mode to move detection that allows indent changesStefan Beller2018-07-194-2/+252
| * | | | | | diff.c: factor advance_or_nullify out of mark_color_as_movedStefan Beller2018-07-171-12/+20
| * | | | | | diff.c: decouple white space treatment from move detection algorithmStefan Beller2018-07-174-6/+113
| * | | | | | diff.c: add a blocks mode for moved code detectionStefan Beller2018-07-174-8/+60
| * | | | | | diff.c: adjust hash function signature to match hashmap expectationStefan Beller2018-07-171-7/+9
| * | | | | | diff.c: do not pass diff options as keydata to hashmapStefan Beller2018-07-171-2/+2
| * | | | | | t4015: avoid git as a pipe inputStefan Beller2018-07-171-30/+20
| * | | | | | xdiff/xdiffi.c: remove unneeded function declarationsStefan Beller2018-07-171-17/+0
| * | | | | | xdiff/xdiff.h: remove unused flagsStefan Beller2018-07-171-8/+0
* | | | | | | Merge branch 'es/test-fixes'Junio C Hamano2018-08-03104-590/+569
|\ \ \ \ \ \ \
| * | | | | | | t5608: fix broken &&-chainSZEDER Gábor2018-07-171-1/+1
| * | | | | | | t9119: fix broken &&-chainsEric Sunshine2018-07-161-60/+60
| * | | | | | | t9000-t9999: fix broken &&-chainsEric Sunshine2018-07-1626-51/+51
| * | | | | | | t7000-t7999: fix broken &&-chainsEric Sunshine2018-07-167-57/+57
| * | | | | | | t6000-t6999: fix broken &&-chainsEric Sunshine2018-07-165-17/+17
| * | | | | | | t5000-t5999: fix broken &&-chainsEric Sunshine2018-07-1614-24/+24
| * | | | | | | t4000-t4999: fix broken &&-chainsEric Sunshine2018-07-166-17/+17
| * | | | | | | t3030: fix broken &&-chainsEric Sunshine2018-07-161-170/+170
| * | | | | | | t3000-t3999: fix broken &&-chainsEric Sunshine2018-07-1610-28/+28
| * | | | | | | t2000-t2999: fix broken &&-chainsEric Sunshine2018-07-162-8/+8
| * | | | | | | t1000-t1999: fix broken &&-chainsEric Sunshine2018-07-166-19/+19
| * | | | | | | t0000-t0999: fix broken &&-chainsEric Sunshine2018-07-163-15/+15
| * | | | | | | t9814: simplify convoluted check that command correctly errors outEric Sunshine2018-07-161-15/+3
| * | | | | | | t9001: fix broken "invoke hook" testEric Sunshine2018-07-161-2/+2
| * | | | | | | t7810: use test_expect_code() instead of hand-rolled comparisonEric Sunshine2018-07-161-4/+3
| * | | | | | | t7400: fix broken "submodule add/reconfigure --force" testEric Sunshine2018-07-161-5/+6
| * | | | | | | t7201: drop pointless "exit 0" at end of subshellEric Sunshine2018-07-031-1/+0
| * | | | | | | t6036: fix broken "merge fails but has appropriate contents" testsEric Sunshine2018-07-031-4/+4
| * | | | | | | t5505: modernize and simplify hard-to-digest testEric Sunshine2018-07-031-6/+2
| * | | | | | | t5406: use write_script() instead of birthing shell script manuallyEric Sunshine2018-07-031-2/+3
| * | | | | | | t5405: use test_must_fail() instead of checking exit code manuallyEric Sunshine2018-07-031-2/+1
| * | | | | | | t/lib-submodule-update: fix "absorbing" testEric Sunshine2018-07-031-3/+2
| * | | | | | | t: drop unnecessary terminating semicolon in subshellEric Sunshine2018-07-033-4/+4
| * | | | | | | t: use sane_unset() rather than 'unset' with broken &&-chainEric Sunshine2018-07-032-3/+3
| * | | | | | | t: use test_write_lines() instead of series of 'echo' commandsEric Sunshine2018-07-0310-62/+61
| * | | | | | | t: use test_might_fail() instead of manipulating exit code manuallyEric Sunshine2018-07-034-10/+8
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'ds/commit-graph-fsck'Junio C Hamano2018-08-0314-83/+575
|\ \ \ \ \ \ \
| * | | | | | | coccinelle: update commit.cocciDerrick Stolee2018-07-161-1/+1
| * | | | | | | commit-graph: update design documentDerrick Stolee2018-06-271-22/+0
| * | | | | | | gc: automatically write commit-graph filesDerrick Stolee2018-06-274-3/+30
| * | | | | | | commit-graph: add '--reachable' optionDerrick Stolee2018-06-275-6/+49
| * | | | | | | commit-graph: use string-list API for inputDerrick Stolee2018-06-273-38/+23
| * | | | | | | fsck: verify commit-graphDerrick Stolee2018-06-273-0/+32
| * | | | | | | commit-graph: verify contents match checksumDerrick Stolee2018-06-272-2/+20