summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* userdiff: add and use for_each_userdiff_driver()Ævar Arnfjörð Bjarmason2021-04-082-12/+71
* userdiff style: normalize pascal regex declarationÆvar Arnfjörð Bjarmason2021-04-081-3/+2
* userdiff style: declare patterns with consistent styleÆvar Arnfjörð Bjarmason2021-04-081-5/+15
* userdiff style: re-order drivers in alphabetical orderÆvar Arnfjörð Bjarmason2021-04-081-38/+38
* The second batchJunio C Hamano2021-03-221-2/+50
* Merge branch 'bc/clone-bare-with-conflicting-config'Junio C Hamano2021-03-222-2/+10
|\
| * builtin/init-db: handle bare clones when core.bare set to falsebrian m. carlson2021-03-112-2/+10
* | Merge branch 'jk/filter-branch-sha256'Junio C Hamano2021-03-222-14/+33
|\ \
| * | filter-branch: drop $_x40 globJeff King2021-03-101-6/+1
| * | filter-branch: drop multiple-ancestor warningJeff King2021-03-101-9/+2
| * | t7003: test ref rewriting explicitlyJeff King2021-03-101-0/+31
* | | Merge branch 'ps/update-ref-trans-hook-doc'Junio C Hamano2021-03-221-12/+21
|\ \ \
| * | | githooks.txt: clarify documentation on reference-transaction hookPatrick Steinhardt2021-03-011-1/+10
| * | | githooks.txt: replace mentions of SHA-1 specific propertiesPatrick Steinhardt2021-03-011-11/+11
* | | | Merge branch 'rr/mailmap-entry-self'Junio C Hamano2021-03-221-0/+1
|\ \ \ \
| * | | | Add entry for Ramkumar RamachandraRamkumar Ramachandra2021-03-081-0/+1
* | | | | Merge branch 'jr/doc-ignore-typofix'Junio C Hamano2021-03-221-1/+1
|\ \ \ \ \
| * | | | | doc: .gitignore documentation typofixJulien Richard2021-03-041-1/+1
* | | | | | Merge branch 'sv/t9801-test-path-is-file-cleanup'Junio C Hamano2021-03-221-19/+19
|\ \ \ \ \ \
| * | | | | | t9801: replace test -f with test_path_is_fileShubham Verma2021-03-041-19/+19
| |/ / / / /
* | | | | | Merge branch 'dl/cat-file-doc-cleanup'Junio C Hamano2021-03-221-33/+34
|\ \ \ \ \ \
| * | | | | | git-cat-file.txt: remove references to "sha1"Denton Liu2021-03-041-5/+6
| * | | | | | git-cat-file.txt: monospace args, placeholders and filenamesDenton Liu2021-03-041-28/+28
| |/ / / / /
* | | | | | Merge branch 'rs/pretty-describe'Junio C Hamano2021-03-228-7/+145
|\ \ \ \ \ \
| * | | | | | archive: expand only a single %(describe) per archiveRené Scharfe2021-03-116-7/+41
| * | | | | | pretty: document multiple %(describe) being inconsistentRené Scharfe2021-03-011-1/+3
| * | | | | | t4205: assert %(describe) test coverageRené Scharfe2021-03-011-1/+10
| * | | | | | pretty: add merge and exclude options to %(describe)René Scharfe2021-02-173-4/+68
| * | | | | | pretty: add %(describe)René Scharfe2021-02-173-0/+29
* | | | | | | Merge branch 'dl/stash-show-untracked'Junio C Hamano2021-03-227-9/+214
|\ \ \ \ \ \ \
| * | | | | | | stash show: learn stash.showIncludeUntrackedDenton Liu2021-03-054-2/+17
| * | | | | | | stash show: teach --include-untracked and --only-untrackedDenton Liu2021-03-056-7/+197
* | | | | | | | Merge branch 'en/ort-perf-batch-8'Junio C Hamano2021-03-224-153/+449
|\ \ \ \ \ \ \ \
| * | | | | | | | diffcore-rename: compute dir_rename_guess from dir_rename_countsElijah Newren2021-02-271-4/+41
| * | | | | | | | diffcore-rename: limit dir_rename_counts computation to relevant dirsElijah Newren2021-02-271-0/+10
| * | | | | | | | diffcore-rename: compute dir_rename_counts in stagesElijah Newren2021-02-271-40/+70
| * | | | | | | | diffcore-rename: extend cleanup_dir_rename_info()Elijah Newren2021-02-271-4/+36
| * | | | | | | | diffcore-rename: move dir_rename_counts into dir_rename_info structElijah Newren2021-02-271-11/+16
| * | | | | | | | diffcore-rename: add function for clearing dir_rename_countElijah Newren2021-02-273-9/+17
| * | | | | | | | Move computation of dir_rename_count from merge-ort to diffcore-renameElijah Newren2021-02-273-130/+145
| * | | | | | | | diffcore-rename: add a mapping of destination names to their indicesElijah Newren2021-02-271-0/+45
| * | | | | | | | diffcore-rename: provide basic implementation of idx_possible_rename()Elijah Newren2021-02-271-6/+94
| * | | | | | | | diffcore-rename: use directory rename guided basename comparisonsElijah Newren2021-02-272-9/+35
* | | | | | | | | Merge branch 'ab/grep-pcre2-allocfix'Junio C Hamano2021-03-223-58/+51
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | grep/pcre2: move definitions of pcre2_{malloc,free}Ævar Arnfjörð Bjarmason2021-02-181-24/+22
| * | | | | | | | | grep/pcre2: move back to thread-only PCREv2 structuresÆvar Arnfjörð Bjarmason2021-02-183-28/+17
| * | | | | | | | | grep/pcre2: actually make pcre2 use custom allocatorÆvar Arnfjörð Bjarmason2021-02-181-2/+2
| * | | | | | | | | grep/pcre2: use pcre2_maketables_free() functionÆvar Arnfjörð Bjarmason2021-02-182-0/+7
| * | | | | | | | | grep/pcre2: use compile-time PCREv2 version testÆvar Arnfjörð Bjarmason2021-02-182-14/+7
| * | | | | | | | | grep/pcre2: add GREP_PCRE2_DEBUG_MALLOC debug modeÆvar Arnfjörð Bjarmason2021-02-181-0/+10