summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'md/test-cleanup'Junio C Hamano2018-10-1639-399/+568
|\
| * tests: order arguments to git-rev-list properlyMatthew DeVore2018-10-073-29/+44
| * t9109: don't swallow Git errors upstream of pipesMatthew DeVore2018-10-071-13/+21
| * tests: don't swallow Git errors upstream of pipesMatthew DeVore2018-10-073-132/+141
| * t/*: fix ordering of expected/observed argumentsMatthew DeVore2018-10-0732-112/+112
| * tests: standardize pipe placementMatthew DeVore2018-10-077-250/+344
| * Documentation: add shell guidelinesMatthew DeVore2018-10-072-0/+45
| * t/README: reformat Do, Don't, Keep in mind listsMatthew DeVore2018-10-071-22/+20
* | Merge branch 'fe/doc-updates'Junio C Hamano2018-10-163-5/+39
|\ \
| * | git-describe.1: clarify that "human readable" is also git-readableFrederick Eaton2018-09-211-1/+3
| * | git-column.1: clarify initial description, provide examplesFrederick Eaton2018-09-211-2/+33
| * | git-archimport.1: specify what kind of Arch we're talking aboutFrederick Eaton2018-09-211-2/+3
* | | Merge branch 'jn/mailmap-update'Junio C Hamano2018-10-161-1/+1
|\ \ \
| * | | mailmap: consistently normalize brian m. carlson's nameJonathan Nieder2018-09-251-1/+1
| |/ /
* | | Merge branch 'tg/t5551-with-curl-7.61.1'Junio C Hamano2018-10-161-34/+34
|\ \ \
| * | | t5551: compare sorted cookies filesThomas Gummerer2018-09-241-2/+2
| * | | t5551: move setup code inside test_expect blocksThomas Gummerer2018-09-241-33/+33
* | | | Merge branch 'en/merge-cleanup'Junio C Hamano2018-10-161-93/+51
|\ \ \ \
| * | | | merge-recursive: rename merge_file_1() and merge_content()Elijah Newren2018-09-201-32/+34
| * | | | merge-recursive: remove final remaining caller of merge_file_one()Elijah Newren2018-09-201-27/+17
| * | | | merge-recursive: avoid wrapper function when unnecessary and wastefulElijah Newren2018-09-201-4/+1
| * | | | merge-recursive: set paths correctly when three-way merging contentElijah Newren2018-09-201-40/+9
* | | | | Merge branch 'rj/header-check'Junio C Hamano2018-10-168-0/+32
|\ \ \ \ \
| * | | | | delta-islands.h: add missing forward declarations (hdr-check)Ramsay Jones2018-09-201-0/+4
| * | | | | midx.h: add missing forward declarations (hdr-check)Ramsay Jones2018-09-201-0/+3
| * | | | | refs/refs-internal.h: add missing declarations (hdr-check)Ramsay Jones2018-09-201-0/+4
| * | | | | refs/packed-backend.h: add missing declaration (hdr-check)Ramsay Jones2018-09-201-0/+2
| * | | | | refs/ref-cache.h: add missing declarations (hdr-check)Ramsay Jones2018-09-201-0/+3
| * | | | | ewah/ewok_rlw.h: add missing include (hdr-check)Ramsay Jones2018-09-201-0/+2
| * | | | | json-writer.h: add missing include (hdr-check)Ramsay Jones2018-09-201-0/+2
| * | | | | Makefile: add a hdr-check targetRamsay Jones2018-09-201-0/+12
| |/ / / /
* | | | | Merge branch 'ma/config-doc-update'Junio C Hamano2018-10-163-6/+6
|\ \ \ \ \
| * | | | | git-config.txt: fix 'see: above' noteMartin Ågren2018-09-201-2/+2
| * | | | | Doc: use `--type=bool` instead of `--bool`Martin Ågren2018-09-203-4/+4
| |/ / / /
* | | | | Merge branch 'jk/delta-islands-with-bitmap-reuse-delta-fix'Junio C Hamano2018-10-161-16/+52
|\ \ \ \ \
| * | | | | pack-objects: handle island check for "external" delta baseJeff King2018-09-191-16/+52
* | | | | | Merge branch 'tq/refs-internal-comment-fix'Junio C Hamano2018-10-161-1/+1
|\ \ \ \ \ \
| * | | | | | refs: docstring typoTao Qingyun2018-09-171-1/+1
* | | | | | | Merge branch 'ts/alias-of-alias'Junio C Hamano2018-10-162-3/+65
|\ \ \ \ \ \ \
| * | | | | | | t0014: introduce an alias testing suiteTim Schumacher2018-09-171-0/+40
| * | | | | | | alias: show the call history when an alias is loopingTim Schumacher2018-09-171-2/+15
| * | | | | | | alias: add support for aliases of an aliasTim Schumacher2018-09-171-3/+12
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'ds/commit-graph-with-grafts'Junio C Hamano2018-10-1616-30/+194
|\ \ \ \ \ \ \
| * | | | | | | commit-graph: close_commit_graph before shallow walkDerrick Stolee2018-08-213-4/+7
| * | | | | | | commit-graph: not compatible with uninitialized repoDerrick Stolee2018-08-211-0/+3
| * | | | | | | commit-graph: not compatible with graftsDerrick Stolee2018-08-214-1/+46
| * | | | | | | commit-graph: not compatible with replace objectsDerrick Stolee2018-08-215-1/+50
| * | | | | | | test-repository: properly init repoDerrick Stolee2018-08-211-2/+8
| * | | | | | | commit-graph: update design documentDerrick Stolee2018-08-211-3/+15
| * | | | | | | refs.c: upgrade for_each_replace_ref to be a each_repo_ref_fn callbackStefan Beller2018-08-214-12/+12
View Lorry Controller Status