summaryrefslogtreecommitdiff
path: root/merge-recursive.c
AgeCommit message (Expand)Author
2018-06-25Merge branch 'sb/object-store-alloc'Junio C Hamano
2018-06-25Merge branch 'nd/commit-util-to-slab'Junio C Hamano
2018-06-18Merge branch 'en/rename-directory-detection'Junio C Hamano
2018-06-14merge-recursive: use xstrdup() instead of fixed bufferRené Scharfe
2018-06-13Merge branch 'sb/submodule-merge-in-merge-recursive'Junio C Hamano
2018-06-11merge-submodule: reduce output verbosityLeif Middelschulte
2018-05-30Merge branch 'ma/unpack-trees-free-msgs'Junio C Hamano
2018-05-30Merge branch 'sb/submodule-merge-in-merge-recursive'Junio C Hamano
2018-05-30Merge branch 'js/use-bug-macro'Junio C Hamano
2018-05-30Merge branch 'bp/merge-rename-config'Junio C Hamano
2018-05-23Merge branch 'en/rename-directory-detection-reboot'Junio C Hamano
2018-05-23Merge branch 'ds/lazy-load-trees'Junio C Hamano
2018-05-22unpack_trees_options: free messages when doneMartin Ågren
2018-05-21merge: use commit-slab in merge remote desc instead of commit->utilNguyễn Thái Ngọc Duy
2018-05-20merge-recursive: provide pair of `unpack_trees_{start,finish}()`Elijah Newren
2018-05-17merge-recursive: give notice when submodule commit gets fast-forwardedLeif Middelschulte
2018-05-16alloc: allow arbitrary repositories for alloc functionsStefan Beller
2018-05-16merge-recursive: i18n submodule merge output and respect verbosityStefan Beller
2018-05-16submodule.c: move submodule merging to merge-recursive.cStefan Beller
2018-05-09alloc: add repository argument to alloc_commit_nodeStefan Beller
2018-05-08merge: pass aggressive when rename detection is turned offBen Peart
2018-05-08merge: add merge.renames config settingBen Peart
2018-05-08merge-recursive: fix check for skipability of working tree updatesElijah Newren
2018-05-08merge-recursive: make "Auto-merging" comment show for other mergesElijah Newren
2018-05-08merge-recursive: fix remainder of was_dirty() to use original indexElijah Newren
2018-05-08merge-recursive: fix was_tracked() to quit lying with some renamed pathsElijah Newren
2018-05-08merge-recursive: avoid triggering add_cacheinfo error with dirty modElijah Newren
2018-05-08merge-recursive: move more is_dirty handling to merge_contentElijah Newren
2018-05-08merge-recursive: improve add_cacheinfo error handlingElijah Newren
2018-05-08merge-recursive: avoid spurious rename/rename conflict from dir renamesElijah Newren
2018-05-08merge-recursive: fix remaining directory rename + dirty overwrite casesElijah Newren
2018-05-08merge-recursive: fix overwriting dirty files involved in renamesElijah Newren
2018-05-08merge-recursive: avoid clobbering untracked files with directory renamesElijah Newren
2018-05-08merge-recursive: apply necessary modifications for directory renamesElijah Newren
2018-05-08merge-recursive: when comparing files, don't include treesElijah Newren
2018-05-08merge-recursive: check for file level conflicts then get new nameElijah Newren
2018-05-08merge-recursive: add computation of collisions due to dir rename & mergingElijah Newren
2018-05-08merge-recursive: check for directory level conflictsElijah Newren
2018-05-08merge-recursive: add get_directory_renames()Elijah Newren
2018-05-06Replace all die("BUG: ...") calls by BUG() onesJohannes Schindelin
2018-04-20merge-recursive: make a helper function for cleanup for handle_renamesElijah Newren
2018-04-20merge-recursive: split out code for determining diff_filepairsElijah Newren
2018-04-20merge-recursive: make !o->detect_rename codepath more obviousElijah Newren
2018-04-20merge-recursive: fix leaks of allocated renames and diff_filepairsElijah Newren
2018-04-20merge-recursive: introduce new functions to handle rename logicElijah Newren
2018-04-20merge-recursive: move the get_renames() functionElijah Newren
2018-04-11Revert "Merge branch 'en/rename-directory-detection'"Junio C Hamano
2018-04-11treewide: replace maybe_tree with accessor methodsDerrick Stolee
2018-04-11treewide: rename tree to maybe_treeDerrick Stolee
2018-04-09Merge branch 'bc/object-id'Junio C Hamano
generated by cgit v0.10.2-6-g49f6 at 2024-04-19 23:48:22 (GMT)