summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | t5303: use printf to generate delta basesJeff King2018-08-301-10/+10
| * | | | | | | | patch-delta: handle truncated copy parametersJeff King2018-08-302-8/+15
| * | | | | | | | patch-delta: consistently report corruptionJann Horn2018-08-302-2/+33
| * | | | | | | | patch-delta: fix oob readJann Horn2018-08-302-2/+2
| * | | | | | | | t5303: test some corrupt deltasJeff King2018-08-301-0/+59
| * | | | | | | | test-delta: read input into a heap bufferJeff King2018-08-301-4/+4
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'ds/commit-graph-tests'Junio C Hamano2018-09-178-12/+22
|\ \ \ \ \ \ \ \
| * | | | | | | | commit-graph: define GIT_TEST_COMMIT_GRAPHDerrick Stolee2018-08-298-12/+22
| |/ / / / / / /
* | | | | | | | Merge branch 'jk/pack-objects-with-bitmap-fix'Junio C Hamano2018-09-173-12/+97
|\ \ \ \ \ \ \ \
| * | | | | | | | pack-bitmap: drop "loaded" flagJeff King2018-09-041-6/+3
| * | | | | | | | traverse_bitmap_commit_list(): don't free resultJeff King2018-09-041-3/+0
| * | | | | | | | t5310: test delta reuse with bitmapsJeff King2018-09-041-0/+93
| * | | | | | | | bitmap_has_sha1_in_uninteresting(): drop BUG checkJeff King2018-09-042-3/+1
* | | | | | | | | Merge branch 'rs/mailinfo-format-flowed'Junio C Hamano2018-09-177-2/+2646
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | mailinfo: support format=flowedRené Scharfe2018-08-297-2/+2646
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'jk/cocci'Junio C Hamano2018-09-1775-223/+258
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | show_dirstat: simplify same-content checkJeff King2018-08-291-8/+3
| * | | | | | | | | read-cache: use oideq() in ce_compare functionsJeff King2018-08-291-2/+2
| * | | | | | | | | convert hashmap comparison functions to oideq()Jeff King2018-08-293-13/+13
| * | | | | | | | | convert "hashcmp() != 0" to "!hasheq()"Jeff King2018-08-2912-15/+24
| * | | | | | | | | convert "oidcmp() != 0" to "!oideq()"Jeff King2018-08-2931-49/+55
| * | | | | | | | | convert "hashcmp() == 0" to hasheq()Jeff King2018-08-298-14/+23
| * | | | | | | | | convert "oidcmp() == 0" to oideq()Jeff King2018-08-2952-111/+117
| * | | | | | | | | introduce hasheq() and oideq()Jeff King2018-08-291-0/+10
| * | | | | | | | | coccinelle: use <...> for function exclusionJeff King2018-08-293-13/+13
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'tg/rerere-doc-updates'Junio C Hamano2018-09-172-0/+10
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | rerere: add note about files with existing conflict markersThomas Gummerer2018-08-291-0/+6
| * | | | | | | | | rerere: mention caveat about unmatched conflict markersThomas Gummerer2018-08-291-0/+4
* | | | | | | | | | Merge branch 'es/format-patch-rangediff'Junio C Hamano2018-09-178-25/+144
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| * | | | | | | | | format-patch: allow --range-diff to apply to a lone-patchEric Sunshine2018-08-143-5/+22
| * | | | | | | | | format-patch: add --creation-factor tweak for --range-diffEric Sunshine2018-08-142-2/+16
| * | | | | | | | | format-patch: teach --range-diff to respect -v/--reroll-countEric Sunshine2018-08-142-1/+7
| * | | | | | | | | format-patch: extend --range-diff to accept revision rangeEric Sunshine2018-08-143-7/+19
| * | | | | | | | | format-patch: add --range-diff option to embed diff in cover letterEric Sunshine2018-08-144-0/+62
| * | | | | | | | | range-diff: relieve callers of low-level configuration burdenEric Sunshine2018-08-143-22/+28
| * | | | | | | | | range-diff: publish default creation factorEric Sunshine2018-08-142-1/+3
| * | | | | | | | | range-diff: respect diff_option.file rather than assuming 'stdout'Eric Sunshine2018-08-141-1/+1
| * | | | | | | | | Merge branch 'es/format-patch-interdiff' into es/format-patch-rangediffJunio C Hamano2018-08-148-28/+177
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'js/range-diff' into es/format-patch-rangediffJunio C Hamano2018-08-1419-19/+1915
| |\ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ Merge branch 'es/format-patch-interdiff'Junio C Hamano2018-09-178-28/+177
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | format-patch: allow --interdiff to apply to a lone-patchEric Sunshine2018-07-234-4/+33
| * | | | | | | | | | | log-tree: show_log: make commentary block delimiting reusableEric Sunshine2018-07-231-7/+16
| * | | | | | | | | | | interdiff: teach show_interdiff() to indent interdiffEric Sunshine2018-07-233-3/+14
| * | | | | | | | | | | format-patch: teach --interdiff to respect -v/--reroll-countEric Sunshine2018-07-233-1/+22
| * | | | | | | | | | | format-patch: add --interdiff option to embed diff in cover letterEric Sunshine2018-07-237-2/+78
| * | | | | | | | | | | format-patch: allow additional generated content in make_cover_letter()Eric Sunshine2018-07-231-20/+23
* | | | | | | | | | | | Merge branch 'cc/delta-islands'Junio C Hamano2018-09-1711-43/+932
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | pack-objects: move 'layer' into 'struct packing_data'Christian Couder2018-08-164-6/+28
| * | | | | | | | | | | | pack-objects: move tree_depth into 'struct packing_data'Christian Couder2018-08-164-12/+46
| * | | | | | | | | | | | t5320: tests for delta islandsJeff King2018-08-161-0/+143