summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'vn/xmmap-gently'Junio C Hamano2019-07-251-1/+1
|\
| * read-cache.c: do not die if mmap failsVarun Naik2019-07-151-1/+1
* | Merge branch 'ac/log-use-mailmap-by-default-transition'Junio C Hamano2019-07-254-4/+29
|\ \
| * | tests: defang pager tests by explicitly disabling the log.mailmap warningAriadne Conill2019-07-151-0/+2
| * | documentation: mention --no-use-mailmap and log.mailmap false settingAriadne Conill2019-07-152-2/+3
| * | log: add warning for unspecified log.mailmap settingAriadne Conill2019-07-151-2/+24
* | | Merge branch 'es/local-atomic-push-failure-with-http'Junio C Hamano2019-07-253-0/+69
|\ \ \
| * | | transport-helper: avoid var decl in for () loop controlJunio C Hamano2019-07-161-1/+2
| * | | transport-helper: enforce atomic in push_refs_with_pushEmily Shaffer2019-07-123-0/+68
| | |/ | |/|
* | | Merge branch 'rm/gpg-program-doc-fix'Junio C Hamano2019-07-251-1/+1
|\ \ \
| * | | gpg(docs): use correct --verify syntaxRobert Morgan2019-07-121-1/+1
* | | | Merge branch 'js/unmap-before-ext-diff'Junio C Hamano2019-07-251-0/+2
|\ \ \ \
| * | | | diff: munmap() file contents before running external diffJohannes Schindelin2019-07-111-0/+2
* | | | | Merge branch 'tg/range-diff-output-update'Junio C Hamano2019-07-257-163/+409
|\ \ \ \ \
| * | | | | range-diff: add headers to the outer hunk headerThomas Gummerer2019-07-112-22/+28
| * | | | | range-diff: add filename to inner diffThomas Gummerer2019-07-112-8/+23
| * | | | | range-diff: add section header instead of diff headerThomas Gummerer2019-07-113-17/+192
| * | | | | range-diff: suppress line count in outer diffThomas Gummerer2019-07-114-9/+14
| * | | | | range-diff: don't remove funcname from inner diffThomas Gummerer2019-07-112-6/+7
| * | | | | range-diff: split lines manuallyThomas Gummerer2019-07-111-26/+42
| * | | | | range-diff: fix function parameter indentationThomas Gummerer2019-07-111-2/+2
| * | | | | apply: make parse_git_diff_header publicThomas Gummerer2019-07-112-50/+67
| * | | | | apply: only pass required data to gitdiff_* functionsThomas Gummerer2019-07-111-24/+35
| * | | | | apply: only pass required data to find_name_*Thomas Gummerer2019-07-091-24/+24
| * | | | | apply: only pass required data to check_header_lineThomas Gummerer2019-07-091-4/+4
| * | | | | apply: only pass required data to git_header_nameThomas Gummerer2019-07-091-8/+8
| * | | | | apply: only pass required data to skip_tree_prefixThomas Gummerer2019-07-091-9/+9
| * | | | | apply: replace marc.info link with public-inboxThomas Gummerer2019-07-091-1/+1
* | | | | | Merge branch 'ab/test-env'Junio C Hamano2019-07-2524-127/+298
|\ \ \ \ \ \
| * | | | | | env--helper: mark a file-local symbol as staticRamsay Jones2019-07-111-1/+1
| * | | | | | tests: make GIT_TEST_FAIL_PREREQS a booleanÆvar Arnfjörð Bjarmason2019-06-214-12/+27
| * | | | | | tests: replace test_tristate with "git env--helper"Ævar Arnfjörð Bjarmason2019-06-215-70/+22
| * | | | | | tests README: re-flow a previously changed paragraphÆvar Arnfjörð Bjarmason2019-06-211-4/+4
| * | | | | | tests: make GIT_TEST_GETTEXT_POISON a booleanÆvar Arnfjörð Bjarmason2019-06-2112-18/+46
| * | | | | | t6040 test: stop using global "script" variableÆvar Arnfjörð Bjarmason2019-06-211-3/+3
| * | | | | | config.c: refactor die_bad_number() to not call gettext() earlyÆvar Arnfjörð Bjarmason2019-06-211-9/+10
| * | | | | | env--helper: new undocumented builtin wrapping git_env_*()Ævar Arnfjörð Bjarmason2019-06-216-0/+182
| * | | | | | config tests: simplify include cycle testÆvar Arnfjörð Bjarmason2019-06-211-14/+7
* | | | | | | The sixth batchJunio C Hamano2019-07-191-0/+35
* | | | | | | Merge branch 'ma/ref-filter-leakfix'Junio C Hamano2019-07-191-5/+9
|\ \ \ \ \ \ \
| * | | | | | | ref-filter: fix memory leak in `free_array_item()`Martin Ågren2019-07-101-5/+9
* | | | | | | | Merge branch 'js/trace2-signo-typofix'Junio C Hamano2019-07-191-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | trace2: correct trace2 field name documentationJosh Steadmon2019-07-101-1/+1
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge branch 'kb/mingw-set-home'Junio C Hamano2019-07-191-0/+24
|\ \ \ \ \ \ \ \
| * | | | | | | | mingw: initialize HOME on startupKarsten Blees2019-07-081-0/+24
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch 'ea/merge-code-cleanup'Junio C Hamano2019-07-191-33/+20
|\ \ \ \ \ \ \ \
| * | | | | | | | builtin/merge.c - cleanup of code in for-cycle that tests strategiesEdmundo Carmona Antoranz2019-07-091-33/+20
| |/ / / / / / /
* | | | | | | | Merge branch 'jl/status-reduce-vertical-blank'Junio C Hamano2019-07-194-85/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | status: remove the empty line after hintsJohn Lin2019-06-214-85/+0
* | | | | | | | | Merge branch 'pw/rebase-progress-test-cleanup'Junio C Hamano2019-07-191-8/+11
|\ \ \ \ \ \ \ \ \