Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'vn/xmmap-gently' | Junio C Hamano | 2019-07-25 | 1 | -1/+1 |
|\ | |||||
| * | read-cache.c: do not die if mmap fails | Varun Naik | 2019-07-15 | 1 | -1/+1 |
* | | Merge branch 'ac/log-use-mailmap-by-default-transition' | Junio C Hamano | 2019-07-25 | 4 | -4/+29 |
|\ \ | |||||
| * | | tests: defang pager tests by explicitly disabling the log.mailmap warning | Ariadne Conill | 2019-07-15 | 1 | -0/+2 |
| * | | documentation: mention --no-use-mailmap and log.mailmap false setting | Ariadne Conill | 2019-07-15 | 2 | -2/+3 |
| * | | log: add warning for unspecified log.mailmap setting | Ariadne Conill | 2019-07-15 | 1 | -2/+24 |
* | | | Merge branch 'es/local-atomic-push-failure-with-http' | Junio C Hamano | 2019-07-25 | 3 | -0/+69 |
|\ \ \ | |||||
| * | | | transport-helper: avoid var decl in for () loop control | Junio C Hamano | 2019-07-16 | 1 | -1/+2 |
| * | | | transport-helper: enforce atomic in push_refs_with_push | Emily Shaffer | 2019-07-12 | 3 | -0/+68 |
| | |/ | |/| | |||||
* | | | Merge branch 'rm/gpg-program-doc-fix' | Junio C Hamano | 2019-07-25 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | gpg(docs): use correct --verify syntax | Robert Morgan | 2019-07-12 | 1 | -1/+1 |
* | | | | Merge branch 'js/unmap-before-ext-diff' | Junio C Hamano | 2019-07-25 | 1 | -0/+2 |
|\ \ \ \ | |||||
| * | | | | diff: munmap() file contents before running external diff | Johannes Schindelin | 2019-07-11 | 1 | -0/+2 |
* | | | | | Merge branch 'tg/range-diff-output-update' | Junio C Hamano | 2019-07-25 | 7 | -163/+409 |
|\ \ \ \ \ | |||||
| * | | | | | range-diff: add headers to the outer hunk header | Thomas Gummerer | 2019-07-11 | 2 | -22/+28 |
| * | | | | | range-diff: add filename to inner diff | Thomas Gummerer | 2019-07-11 | 2 | -8/+23 |
| * | | | | | range-diff: add section header instead of diff header | Thomas Gummerer | 2019-07-11 | 3 | -17/+192 |
| * | | | | | range-diff: suppress line count in outer diff | Thomas Gummerer | 2019-07-11 | 4 | -9/+14 |
| * | | | | | range-diff: don't remove funcname from inner diff | Thomas Gummerer | 2019-07-11 | 2 | -6/+7 |
| * | | | | | range-diff: split lines manually | Thomas Gummerer | 2019-07-11 | 1 | -26/+42 |
| * | | | | | range-diff: fix function parameter indentation | Thomas Gummerer | 2019-07-11 | 1 | -2/+2 |
| * | | | | | apply: make parse_git_diff_header public | Thomas Gummerer | 2019-07-11 | 2 | -50/+67 |
| * | | | | | apply: only pass required data to gitdiff_* functions | Thomas Gummerer | 2019-07-11 | 1 | -24/+35 |
| * | | | | | apply: only pass required data to find_name_* | Thomas Gummerer | 2019-07-09 | 1 | -24/+24 |
| * | | | | | apply: only pass required data to check_header_line | Thomas Gummerer | 2019-07-09 | 1 | -4/+4 |
| * | | | | | apply: only pass required data to git_header_name | Thomas Gummerer | 2019-07-09 | 1 | -8/+8 |
| * | | | | | apply: only pass required data to skip_tree_prefix | Thomas Gummerer | 2019-07-09 | 1 | -9/+9 |
| * | | | | | apply: replace marc.info link with public-inbox | Thomas Gummerer | 2019-07-09 | 1 | -1/+1 |
* | | | | | | Merge branch 'ab/test-env' | Junio C Hamano | 2019-07-25 | 24 | -127/+298 |
|\ \ \ \ \ \ | |||||
| * | | | | | | env--helper: mark a file-local symbol as static | Ramsay Jones | 2019-07-11 | 1 | -1/+1 |
| * | | | | | | tests: make GIT_TEST_FAIL_PREREQS a boolean | Ævar Arnfjörð Bjarmason | 2019-06-21 | 4 | -12/+27 |
| * | | | | | | tests: replace test_tristate with "git env--helper" | Ævar Arnfjörð Bjarmason | 2019-06-21 | 5 | -70/+22 |
| * | | | | | | tests README: re-flow a previously changed paragraph | Ævar Arnfjörð Bjarmason | 2019-06-21 | 1 | -4/+4 |
| * | | | | | | tests: make GIT_TEST_GETTEXT_POISON a boolean | Ævar Arnfjörð Bjarmason | 2019-06-21 | 12 | -18/+46 |
| * | | | | | | t6040 test: stop using global "script" variable | Ævar Arnfjörð Bjarmason | 2019-06-21 | 1 | -3/+3 |
| * | | | | | | config.c: refactor die_bad_number() to not call gettext() early | Ævar Arnfjörð Bjarmason | 2019-06-21 | 1 | -9/+10 |
| * | | | | | | env--helper: new undocumented builtin wrapping git_env_*() | Ævar Arnfjörð Bjarmason | 2019-06-21 | 6 | -0/+182 |
| * | | | | | | config tests: simplify include cycle test | Ævar Arnfjörð Bjarmason | 2019-06-21 | 1 | -14/+7 |
* | | | | | | | The sixth batch | Junio C Hamano | 2019-07-19 | 1 | -0/+35 |
* | | | | | | | Merge branch 'ma/ref-filter-leakfix' | Junio C Hamano | 2019-07-19 | 1 | -5/+9 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | ref-filter: fix memory leak in `free_array_item()` | Martin Ågren | 2019-07-10 | 1 | -5/+9 |
* | | | | | | | | Merge branch 'js/trace2-signo-typofix' | Junio C Hamano | 2019-07-19 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | trace2: correct trace2 field name documentation | Josh Steadmon | 2019-07-10 | 1 | -1/+1 |
| | |_|_|_|_|/ / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'kb/mingw-set-home' | Junio C Hamano | 2019-07-19 | 1 | -0/+24 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | mingw: initialize HOME on startup | Karsten Blees | 2019-07-08 | 1 | -0/+24 |
| | |_|_|/ / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'ea/merge-code-cleanup' | Junio C Hamano | 2019-07-19 | 1 | -33/+20 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | builtin/merge.c - cleanup of code in for-cycle that tests strategies | Edmundo Carmona Antoranz | 2019-07-09 | 1 | -33/+20 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch 'jl/status-reduce-vertical-blank' | Junio C Hamano | 2019-07-19 | 4 | -85/+0 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | status: remove the empty line after hints | John Lin | 2019-06-21 | 4 | -85/+0 |
* | | | | | | | | | Merge branch 'pw/rebase-progress-test-cleanup' | Junio C Hamano | 2019-07-19 | 1 | -8/+11 |
|\ \ \ \ \ \ \ \ \ |