Age | Commit message (Expand) | Author | Files | Lines |
2022-03-16 | Merge branch 'ab/object-file-api-updates' | Junio C Hamano | 1 | -1/+1 |
2022-02-25 | object-file API: have write_object_file() take "enum object_type" | Ævar Arnfjörð Bjarmason | 1 | -1/+1 |
2022-02-02 | merge-ort: format messages slightly different for use in headers | Elijah Newren | 1 | -0/+4 |
2022-02-02 | ll-merge: make callers responsible for showing warnings | Elijah Newren | 1 | -1/+4 |
2021-10-25 | Merge branch 'jt/no-abuse-alternate-odb-for-submodules' | Junio C Hamano | 1 | -21/+20 |
2021-10-13 | Merge branch 'en/removing-untracked-fixes' | Junio C Hamano | 1 | -1/+4 |
2021-10-08 | merge-{ort,recursive}: remove add_submodule_odb() | Jonathan Tan | 1 | -21/+20 |
2021-10-06 | Merge branch 'jt/add-submodule-odb-clean-up' | Junio C Hamano | 1 | -17/+32 |
2021-09-27 | unpack-trees: introduce preserve_ignored to unpack_trees_options | Elijah Newren | 1 | -7/+1 |
2021-09-27 | read-tree, merge-recursive: overwrite ignored files by default | Elijah Newren | 1 | -1/+10 |
2021-09-22 | Merge branch 'jt/add-submodule-odb-clean-up' into jt/no-abuse-alternate-odb-f... | Junio C Hamano | 1 | -17/+32 |
2021-09-20 | Merge branch 'ds/mergies-with-sparse-index' | Junio C Hamano | 1 | -0/+3 |
2021-09-09 | merge: make sparse-aware with ORT | Derrick Stolee | 1 | -0/+3 |
2021-09-09 | revision: remove "submodule" from opt struct | Jonathan Tan | 1 | -17/+32 |
2021-08-30 | merge-recursive: use fspathcmp() in path_hashmap_cmp() | René Scharfe | 1 | -4/+1 |
2021-07-30 | use fspathhash() everywhere | René Scharfe | 1 | -8/+3 |
2021-07-28 | Merge branch 'en/rename-limits-doc' | Junio C Hamano | 1 | -1/+1 |
2021-07-28 | Merge branch 'ab/attribute-format' | Junio C Hamano | 1 | -0/+1 |
2021-07-16 | Merge branch 'ab/struct-init' | Junio C Hamano | 1 | -2/+2 |
2021-07-16 | Merge branch 'en/merge-dir-rename-corner-case-fix' | Junio C Hamano | 1 | -6/+13 |
2021-07-15 | rename: bump limit defaults yet again | Elijah Newren | 1 | -1/+1 |
2021-07-13 | *.c static functions: add missing __attribute__((format)) | Ævar Arnfjörð Bjarmason | 1 | -0/+1 |
2021-07-01 | string-list.h users: change to use *_{nodup,dup}() | Ævar Arnfjörð Bjarmason | 1 | -2/+2 |
2021-06-30 | merge-recursive: handle rename-to-self case | Elijah Newren | 1 | -6/+13 |
2021-06-14 | *: fix typos which duplicate a word | Andrei Rybak | 1 | -1/+1 |
2021-05-11 | Merge branch 'js/merge-already-up-to-date-message-reword' | Junio C Hamano | 1 | -1/+1 |
2021-05-10 | Merge branch 'bc/hash-transition-interop-part-1' | Junio C Hamano | 1 | -5/+5 |
2021-05-03 | merge(s): apply consistent punctuation to "up to date" messages | Eric Sunshine | 1 | -1/+1 |
2021-04-30 | Merge branch 'ds/sparse-index-protections' | Junio C Hamano | 1 | -1/+3 |
2021-04-27 | hash: provide per-algorithm null OIDs | brian m. carlson | 1 | -5/+5 |
2021-04-16 | Merge branch 'en/ort-readiness' | Junio C Hamano | 1 | -0/+37 |
2021-04-14 | merge-recursive: ensure full index | Derrick Stolee | 1 | -0/+2 |
2021-04-14 | *: remove 'const' qualifier for struct index_state | Derrick Stolee | 1 | -1/+1 |
2021-03-30 | Merge branch 'ab/read-tree' | Junio C Hamano | 1 | -3/+3 |
2021-03-20 | tree.h API: simplify read_tree_recursive() signature | Ævar Arnfjörð Bjarmason | 1 | -3/+3 |
2021-03-20 | merge-recursive: add a bunch of FIXME comments documenting known bugs | Elijah Newren | 1 | -0/+37 |
2021-03-13 | use CALLOC_ARRAY | René Scharfe | 1 | -5/+4 |
2020-12-16 | commit: move reverse_commit_list() from merge-recursive | Elijah Newren | 1 | -11/+0 |
2020-11-02 | hashmap: provide deallocation function names | Elijah Newren | 1 | -3/+3 |
2020-08-10 | Merge branch 'en/eol-attrs-gotchas' | Junio C Hamano | 1 | -0/+3 |
2020-08-03 | merge: make merge.renormalize work for all uses of merge machinery | Elijah Newren | 1 | -0/+3 |
2020-08-02 | merge-recursive: fix unclear and outright wrong comments | Elijah Newren | 1 | -2/+3 |
2020-05-14 | merge-recursive: fix rename/rename(1to2) for working tree with a binary | Elijah Newren | 1 | -0/+12 |
2020-03-16 | convert: permit passing additional metadata to filter processes | brian m. carlson | 1 | -1/+1 |
2020-03-09 | Merge branch 'en/merge-path-collision' | Junio C Hamano | 1 | -105/+47 |
2020-03-02 | Merge branch 'en/t3433-rebase-stat-dirty-failure' | Junio C Hamano | 1 | -2/+5 |
2020-02-27 | merge-recursive: apply collision handling unification to recursive case | Elijah Newren | 1 | -105/+47 |
2020-02-19 | merge-recursive: fix the refresh logic in update_file_flags | Elijah Newren | 1 | -2/+5 |
2020-01-27 | merge-recursive: use subtraction to flip stage | Junio C Hamano | 1 | -3/+2 |
2020-01-27 | merge-recursive: silence -Wxor-used-as-pow warning | Jeff King | 1 | -5/+14 |