Age | Commit message (Expand) | Author | Files | Lines |
2018-09-20 | merge-recursive: remove final remaining caller of merge_file_one() | Elijah Newren | 1 | -27/+17 |
2018-09-20 | merge-recursive: avoid wrapper function when unnecessary and wasteful | Elijah Newren | 1 | -4/+1 |
2018-09-20 | merge-recursive: set paths correctly when three-way merging content | Elijah Newren | 1 | -40/+9 |
2018-09-17 | Merge branch 'jk/cocci' | Junio C Hamano | 1 | -2/+2 |
2018-09-17 | Merge branch 'ds/reachable' | Junio C Hamano | 1 | -0/+1 |
2018-09-05 | Remove superfluous trailing semicolons | Elijah Newren | 1 | -1/+1 |
2018-09-04 | Merge branch 'en/directory-renames-nothanks' | Junio C Hamano | 1 | -5/+13 |
2018-08-30 | merge-recursive: add ability to turn off directory rename detection | Elijah Newren | 1 | -5/+13 |
2018-08-29 | convert "oidcmp() == 0" to oideq() | Jeff King | 1 | -2/+2 |
2018-08-20 | Merge branch 'nd/no-the-index' | Junio C Hamano | 1 | -1/+1 |
2018-08-15 | Merge branch 'en/merge-recursive-skip-fix' | Junio C Hamano | 1 | -0/+16 |
2018-08-13 | convert.c: remove an implicit dependency on the_index | Nguyễn Thái Ngọc Duy | 1 | -1/+1 |
2018-08-02 | Merge branch 'en/dirty-merge-fixes' | Junio C Hamano | 1 | -7/+7 |
2018-08-02 | Merge branch 'jm/cache-entry-from-mem-pool' | Junio C Hamano | 1 | -2/+2 |
2018-08-02 | Merge branch 'sb/object-store-lookup' | Junio C Hamano | 1 | -7/+10 |
2018-07-27 | merge-recursive: preserve skip_worktree bit when necessary | Elijah Newren | 1 | -0/+16 |
2018-07-20 | commit.h: remove method declarations | Derrick Stolee | 1 | -0/+1 |
2018-07-18 | Merge branch 'sb/object-store-grafts' | Junio C Hamano | 1 | -0/+1 |
2018-07-18 | Merge branch 'en/merge-recursive-cleanup' | Junio C Hamano | 1 | -82/+104 |
2018-07-11 | merge-recursive: enforce rule that index matches head before merging | Elijah Newren | 1 | -7/+7 |
2018-07-11 | merge-recursive: fix assumption that head tree being merged is HEAD | Elijah Newren | 1 | -1/+1 |
2018-07-11 | merge-recursive: make sure when we say we abort that we actually abort | Elijah Newren | 1 | -2/+2 |
2018-07-03 | index_has_changes(): avoid assuming operating on the_index | Elijah Newren | 1 | -1/+1 |
2018-07-03 | block alloc: add lifecycle APIs for cache_entry structs | Jameson Miller | 1 | -1/+1 |
2018-07-03 | read-cache: teach make_cache_entry to take object_id | Jameson Miller | 1 | -1/+1 |
2018-07-03 | read-cache: teach refresh_cache_entry to take istate | Jameson Miller | 1 | -1/+1 |
2018-06-29 | tag: add repository argument to deref_tag | Stefan Beller | 1 | -1/+2 |
2018-06-29 | commit: add repository argument to lookup_commit_reference | Stefan Beller | 1 | -3/+3 |
2018-06-29 | tree: add repository argument to lookup_tree | Stefan Beller | 1 | -3/+3 |
2018-06-29 | object: add repository argument to parse_object | Stefan Beller | 1 | -1/+3 |
2018-06-29 | Merge branch 'sb/object-store-grafts' into sb/object-store-lookup | Junio C Hamano | 1 | -0/+1 |
2018-06-25 | Merge branch 'sb/object-store-alloc' | Junio C Hamano | 1 | -1/+2 |
2018-06-25 | Merge branch 'nd/commit-util-to-slab' | Junio C Hamano | 1 | -3/+5 |
2018-06-18 | Merge branch 'en/rename-directory-detection' | Junio C Hamano | 1 | -5/+5 |
2018-06-14 | merge-recursive: use xstrdup() instead of fixed buffer | René Scharfe | 1 | -5/+5 |
2018-06-13 | Merge branch 'sb/submodule-merge-in-merge-recursive' | Junio C Hamano | 1 | -2/+2 |
2018-06-12 | merge-recursive: add pointer about unduly complex looking code | Elijah Newren | 1 | -0/+15 |
2018-06-12 | merge-recursive: rename conflict_rename_*() family of functions | Elijah Newren | 1 | -43/+43 |
2018-06-12 | merge-recursive: clarify the rename_dir/RENAME_DIR meaning | Elijah Newren | 1 | -11/+17 |
2018-06-12 | merge-recursive: align labels with their respective code blocks | Elijah Newren | 1 | -3/+3 |
2018-06-12 | merge-recursive: fix numerous argument alignment issues | Elijah Newren | 1 | -37/+38 |
2018-06-12 | merge-recursive: fix miscellaneous grammar error in comment | Elijah Newren | 1 | -1/+1 |
2018-06-11 | merge-submodule: reduce output verbosity | Leif Middelschulte | 1 | -2/+2 |
2018-05-30 | Merge branch 'ma/unpack-trees-free-msgs' | Junio C Hamano | 1 | -14/+16 |
2018-05-30 | Merge branch 'sb/submodule-merge-in-merge-recursive' | Junio C Hamano | 1 | -3/+182 |
2018-05-30 | Merge branch 'js/use-bug-macro' | Junio C Hamano | 1 | -6/+6 |
2018-05-30 | Merge branch 'bp/merge-rename-config' | Junio C Hamano | 1 | -6/+25 |
2018-05-23 | Merge branch 'en/rename-directory-detection-reboot' | Junio C Hamano | 1 | -170/+1262 |
2018-05-23 | Merge branch 'ds/lazy-load-trees' | Junio C Hamano | 1 | -2/+3 |
2018-05-22 | unpack_trees_options: free messages when done | Martin Ågren | 1 | -0/+1 |