Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'ds/sha256-leftover-bits' | Junio C Hamano | 2020-08-20 | 6 | -11/+96 |
|\ | |||||
| * | multi-pack-index: use hash version byte | Derrick Stolee | 2020-08-18 | 2 | -6/+45 |
| * | commit-graph: use the "hash version" byte | Derrick Stolee | 2020-08-18 | 3 | -5/+47 |
| * | t/README: document GIT_TEST_DEFAULT_HASH | Derrick Stolee | 2020-08-18 | 1 | -0/+4 |
* | | Merge branch 'jc/object-names-are-not-sha-1' | Junio C Hamano | 2020-08-20 | 1 | -1/+1 |
|\ \ | |||||
| * | | messages: avoid SHA-1 in end-user facing messages | Junio C Hamano | 2020-08-14 | 1 | -1/+1 |
* | | | Merge branch 'pb/userdiff-fortran-update' | Junio C Hamano | 2020-08-20 | 10 | -0/+95 |
|\ \ \ | |||||
| * | | | userdiff: improve Fortran xfuncname regex | Philippe Blain | 2020-08-13 | 1 | -1/+0 |
| * | | | userdiff: add tests for Fortran xfuncname regex | Philippe Blain | 2020-08-13 | 10 | -0/+96 |
| |/ / | |||||
* | | | Merge branch 'jk/blame-coalesce-fix' | Junio C Hamano | 2020-08-20 | 1 | -9/+19 |
|\ \ \ | |||||
| * | | | blame: only coalesce lines that are adjacent in result | Jeff King | 2020-08-13 | 1 | -0/+9 |
| * | | | t8003: factor setup out of coalesce test | Jeff King | 2020-08-13 | 1 | -6/+10 |
| * | | | t8003: check output of coalesced blame | Jeff King | 2020-08-13 | 1 | -7/+4 |
| |/ / | |||||
* | | | Merge branch 'ak/sequencer-fix-find-uniq-abbrev' | Junio C Hamano | 2020-08-20 | 1 | -0/+6 |
|\ \ \ | |||||
| * | | | rebase -i: fix possibly wrong onto hash in todo | Antti Keränen | 2020-08-13 | 1 | -0/+6 |
| |/ / | |||||
* | | | Merge branch 'en/sequencer-merge-labels' | Junio C Hamano | 2020-08-20 | 2 | -11/+11 |
|\ \ \ | |||||
| * | | | sequencer: avoid garbled merge machinery messages due to commit labels | Elijah Newren | 2020-08-14 | 2 | -11/+11 |
| |/ / | |||||
* | | | Merge branch 'en/merge-tests' | Junio C Hamano | 2020-08-20 | 35 | -48/+71 |
|\ \ \ | |||||
| * | | | t6425: be more flexible with rename/delete conflict messages | Elijah Newren | 2020-08-11 | 1 | -1/+2 |
| * | | | t642[23]: be more flexible for add/add conflicts involving pair renames | Elijah Newren | 2020-08-11 | 2 | -8/+14 |
| * | | | t6422, t6426: be more flexible for add/add conflicts involving renames | Elijah Newren | 2020-08-11 | 2 | -9/+14 |
| * | | | t6423: add an explanation about why one of the tests does not pass | Elijah Newren | 2020-08-11 | 1 | -0/+8 |
| * | | | t6416, t6423: clarify some comments and fix some typos | Elijah Newren | 2020-08-11 | 2 | -14/+13 |
| * | | | t6422: fix multiple errors with the mod6 test expectations | Elijah Newren | 2020-08-11 | 1 | -9/+10 |
| * | | | t6423: fix test setup for a couple tests | Elijah Newren | 2020-08-11 | 1 | -0/+2 |
| * | | | t6416, t6422: fix incorrect untracked file count | Elijah Newren | 2020-08-11 | 2 | -3/+3 |
| * | | | t6422: fix bad check against missing file | Elijah Newren | 2020-08-11 | 1 | -3/+3 |
| * | | | t6418: tighten delete/normalize conflict testcase | Elijah Newren | 2020-08-11 | 1 | -1/+2 |
| * | | | Collect merge-related tests to t64xx | Elijah Newren | 2020-08-11 | 35 | -0/+0 |
* | | | | Merge branch 'so/log-diff-merges-opt' | Junio C Hamano | 2020-08-18 | 3 | -0/+158 |
|\ \ \ \ | |||||
| * | | | | t/t4013: add test for --diff-merges=off | Sergey Organov | 2020-08-11 | 3 | -0/+158 |
* | | | | | Merge branch 'jk/log-fp-implies-m' | Junio C Hamano | 2020-08-18 | 3 | -0/+101 |
|\| | | | | |||||
| * | | | | log: enable "-m" automatically with "--first-parent" | Jeff King | 2020-07-29 | 1 | -0/+22 |
| * | | | | revision: add "--no-diff-merges" option to counteract "-m" | Jeff King | 2020-07-29 | 2 | -0/+79 |
| | |/ / | |/| | | |||||
* | | | | Merge branch 'es/test-cmp-typocatcher' | Junio C Hamano | 2020-08-18 | 1 | -2/+14 |
|\ \ \ \ | |||||
| * | | | | test_cmp: diagnose incorrect arguments | Eric Sunshine | 2020-08-09 | 1 | -2/+14 |
| |/ / / | |||||
* | | | | Merge branch 'rp/apply-cached-with-i-t-a' | Junio C Hamano | 2020-08-18 | 1 | -0/+56 |
|\ \ \ \ | |||||
| * | | | | t4140: test apply with i-t-a paths | Raymond E. Pasco | 2020-08-09 | 1 | -0/+56 |
* | | | | | Merge branch 'al/bisect-first-parent' | Junio C Hamano | 2020-08-18 | 3 | -50/+103 |
|\ \ \ \ \ | |||||
| * | | | | | bisect: introduce first-parent flag | Aaron Lipman | 2020-08-08 | 1 | -0/+18 |
| * | | | | | rev-list: allow bisect and first-parent flags | Aaron Lipman | 2020-08-08 | 2 | -2/+47 |
| * | | | | | t6030: modernize "git bisect run" tests | Aaron Lipman | 2020-08-08 | 1 | -48/+38 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge branch 'hn/reftable-prep-part-2' | Junio C Hamano | 2020-08-18 | 2 | -16/+19 |
|\ \ \ \ \ | |||||
| * | | | | | Modify pseudo refs through ref backend storage | Han-Wen Nienhuys | 2020-07-27 | 2 | -6/+9 |
| * | | | | | t1400: use git rev-parse for testing PSEUDOREF existence | Han-Wen Nienhuys | 2020-07-16 | 1 | -10/+10 |
* | | | | | | Merge branch 'dd/send-email-config' | Junio C Hamano | 2020-08-18 | 1 | -0/+29 |
|\ \ \ \ \ \ | |||||
| * | | | | | | git-send-email: die if sendmail.* config is set | Drew DeVault | 2020-07-24 | 1 | -0/+29 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge branch 'ps/ref-transaction-hook' | Junio C Hamano | 2020-08-18 | 1 | -0/+27 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | |||||
| * | | | | | t1416: avoid hard-coded sha1 ids | Jeff King | 2020-08-11 | 1 | -2/+3 |
| * | | | | | refs: fix interleaving hook calls with reference-transaction hook | Patrick Steinhardt | 2020-08-07 | 1 | -0/+26 |