Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | userdiff: add and use for_each_userdiff_driver() | Ævar Arnfjörð Bjarmason | 2021-04-08 | 2 | -12/+71 |
* | userdiff style: normalize pascal regex declaration | Ævar Arnfjörð Bjarmason | 2021-04-08 | 1 | -3/+2 |
* | userdiff style: declare patterns with consistent style | Ævar Arnfjörð Bjarmason | 2021-04-08 | 1 | -5/+15 |
* | userdiff style: re-order drivers in alphabetical order | Ævar Arnfjörð Bjarmason | 2021-04-08 | 1 | -38/+38 |
* | The second batch | Junio C Hamano | 2021-03-22 | 1 | -2/+50 |
* | Merge branch 'bc/clone-bare-with-conflicting-config' | Junio C Hamano | 2021-03-22 | 2 | -2/+10 |
|\ | |||||
| * | builtin/init-db: handle bare clones when core.bare set to false | brian m. carlson | 2021-03-11 | 2 | -2/+10 |
* | | Merge branch 'jk/filter-branch-sha256' | Junio C Hamano | 2021-03-22 | 2 | -14/+33 |
|\ \ | |||||
| * | | filter-branch: drop $_x40 glob | Jeff King | 2021-03-10 | 1 | -6/+1 |
| * | | filter-branch: drop multiple-ancestor warning | Jeff King | 2021-03-10 | 1 | -9/+2 |
| * | | t7003: test ref rewriting explicitly | Jeff King | 2021-03-10 | 1 | -0/+31 |
* | | | Merge branch 'ps/update-ref-trans-hook-doc' | Junio C Hamano | 2021-03-22 | 1 | -12/+21 |
|\ \ \ | |||||
| * | | | githooks.txt: clarify documentation on reference-transaction hook | Patrick Steinhardt | 2021-03-01 | 1 | -1/+10 |
| * | | | githooks.txt: replace mentions of SHA-1 specific properties | Patrick Steinhardt | 2021-03-01 | 1 | -11/+11 |
* | | | | Merge branch 'rr/mailmap-entry-self' | Junio C Hamano | 2021-03-22 | 1 | -0/+1 |
|\ \ \ \ | |||||
| * | | | | Add entry for Ramkumar Ramachandra | Ramkumar Ramachandra | 2021-03-08 | 1 | -0/+1 |
* | | | | | Merge branch 'jr/doc-ignore-typofix' | Junio C Hamano | 2021-03-22 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | doc: .gitignore documentation typofix | Julien Richard | 2021-03-04 | 1 | -1/+1 |
* | | | | | | Merge branch 'sv/t9801-test-path-is-file-cleanup' | Junio C Hamano | 2021-03-22 | 1 | -19/+19 |
|\ \ \ \ \ \ | |||||
| * | | | | | | t9801: replace test -f with test_path_is_file | Shubham Verma | 2021-03-04 | 1 | -19/+19 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'dl/cat-file-doc-cleanup' | Junio C Hamano | 2021-03-22 | 1 | -33/+34 |
|\ \ \ \ \ \ | |||||
| * | | | | | | git-cat-file.txt: remove references to "sha1" | Denton Liu | 2021-03-04 | 1 | -5/+6 |
| * | | | | | | git-cat-file.txt: monospace args, placeholders and filenames | Denton Liu | 2021-03-04 | 1 | -28/+28 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'rs/pretty-describe' | Junio C Hamano | 2021-03-22 | 8 | -7/+145 |
|\ \ \ \ \ \ | |||||
| * | | | | | | archive: expand only a single %(describe) per archive | René Scharfe | 2021-03-11 | 6 | -7/+41 |
| * | | | | | | pretty: document multiple %(describe) being inconsistent | René Scharfe | 2021-03-01 | 1 | -1/+3 |
| * | | | | | | t4205: assert %(describe) test coverage | René Scharfe | 2021-03-01 | 1 | -1/+10 |
| * | | | | | | pretty: add merge and exclude options to %(describe) | René Scharfe | 2021-02-17 | 3 | -4/+68 |
| * | | | | | | pretty: add %(describe) | René Scharfe | 2021-02-17 | 3 | -0/+29 |
* | | | | | | | Merge branch 'dl/stash-show-untracked' | Junio C Hamano | 2021-03-22 | 7 | -9/+214 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | stash show: learn stash.showIncludeUntracked | Denton Liu | 2021-03-05 | 4 | -2/+17 |
| * | | | | | | | stash show: teach --include-untracked and --only-untracked | Denton Liu | 2021-03-05 | 6 | -7/+197 |
* | | | | | | | | Merge branch 'en/ort-perf-batch-8' | Junio C Hamano | 2021-03-22 | 4 | -153/+449 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | diffcore-rename: compute dir_rename_guess from dir_rename_counts | Elijah Newren | 2021-02-27 | 1 | -4/+41 |
| * | | | | | | | | diffcore-rename: limit dir_rename_counts computation to relevant dirs | Elijah Newren | 2021-02-27 | 1 | -0/+10 |
| * | | | | | | | | diffcore-rename: compute dir_rename_counts in stages | Elijah Newren | 2021-02-27 | 1 | -40/+70 |
| * | | | | | | | | diffcore-rename: extend cleanup_dir_rename_info() | Elijah Newren | 2021-02-27 | 1 | -4/+36 |
| * | | | | | | | | diffcore-rename: move dir_rename_counts into dir_rename_info struct | Elijah Newren | 2021-02-27 | 1 | -11/+16 |
| * | | | | | | | | diffcore-rename: add function for clearing dir_rename_count | Elijah Newren | 2021-02-27 | 3 | -9/+17 |
| * | | | | | | | | Move computation of dir_rename_count from merge-ort to diffcore-rename | Elijah Newren | 2021-02-27 | 3 | -130/+145 |
| * | | | | | | | | diffcore-rename: add a mapping of destination names to their indices | Elijah Newren | 2021-02-27 | 1 | -0/+45 |
| * | | | | | | | | diffcore-rename: provide basic implementation of idx_possible_rename() | Elijah Newren | 2021-02-27 | 1 | -6/+94 |
| * | | | | | | | | diffcore-rename: use directory rename guided basename comparisons | Elijah Newren | 2021-02-27 | 2 | -9/+35 |
* | | | | | | | | | Merge branch 'ab/grep-pcre2-allocfix' | Junio C Hamano | 2021-03-22 | 3 | -58/+51 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | grep/pcre2: move definitions of pcre2_{malloc,free} | Ævar Arnfjörð Bjarmason | 2021-02-18 | 1 | -24/+22 |
| * | | | | | | | | | grep/pcre2: move back to thread-only PCREv2 structures | Ævar Arnfjörð Bjarmason | 2021-02-18 | 3 | -28/+17 |
| * | | | | | | | | | grep/pcre2: actually make pcre2 use custom allocator | Ævar Arnfjörð Bjarmason | 2021-02-18 | 1 | -2/+2 |
| * | | | | | | | | | grep/pcre2: use pcre2_maketables_free() function | Ævar Arnfjörð Bjarmason | 2021-02-18 | 2 | -0/+7 |
| * | | | | | | | | | grep/pcre2: use compile-time PCREv2 version test | Ævar Arnfjörð Bjarmason | 2021-02-18 | 2 | -14/+7 |
| * | | | | | | | | | grep/pcre2: add GREP_PCRE2_DEBUG_MALLOC debug mode | Ævar Arnfjörð Bjarmason | 2021-02-18 | 1 | -0/+10 |