summaryrefslogtreecommitdiff
path: root/merge-recursive.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'js/use-bug-macro'Junio C Hamano2018-05-301-6/+6
|\
| * Replace all die("BUG: ...") calls by BUG() onesJohannes Schindelin2018-05-061-6/+6
* | Merge branch 'bp/merge-rename-config'Junio C Hamano2018-05-301-6/+25
|\ \
| * | merge: pass aggressive when rename detection is turned offBen Peart2018-05-081-0/+1
| * | merge: add merge.renames config settingBen Peart2018-05-081-6/+24
* | | Merge branch 'en/rename-directory-detection-reboot'Junio C Hamano2018-05-231-170/+1262
|\ \ \ | |/ /
| * | merge-recursive: fix check for skipability of working tree updatesElijah Newren2018-05-081-16/+32
| * | merge-recursive: make "Auto-merging" comment show for other mergesElijah Newren2018-05-081-26/+39
| * | merge-recursive: fix remainder of was_dirty() to use original indexElijah Newren2018-05-081-3/+3
| * | merge-recursive: fix was_tracked() to quit lying with some renamed pathsElijah Newren2018-05-081-24/+67
| * | merge-recursive: avoid triggering add_cacheinfo error with dirty modElijah Newren2018-05-081-1/+1
| * | merge-recursive: move more is_dirty handling to merge_contentElijah Newren2018-05-081-18/+12
| * | merge-recursive: improve add_cacheinfo error handlingElijah Newren2018-05-081-5/+8
| * | merge-recursive: avoid spurious rename/rename conflict from dir renamesElijah Newren2018-05-081-2/+2
| * | merge-recursive: fix remaining directory rename + dirty overwrite casesElijah Newren2018-05-081-3/+22
| * | merge-recursive: fix overwriting dirty files involved in renamesElijah Newren2018-05-081-19/+66
| * | merge-recursive: avoid clobbering untracked files with directory renamesElijah Newren2018-05-081-2/+40
| * | merge-recursive: apply necessary modifications for directory renamesElijah Newren2018-05-081-1/+186
| * | merge-recursive: when comparing files, don't include treesElijah Newren2018-05-081-6/+21
| * | merge-recursive: check for file level conflicts then get new nameElijah Newren2018-05-081-8/+166
| * | merge-recursive: add computation of collisions due to dir rename & mergingElijah Newren2018-05-081-3/+143
| * | merge-recursive: check for directory level conflictsElijah Newren2018-05-081-0/+119
| * | merge-recursive: add get_directory_renames()Elijah Newren2018-05-081-3/+221
| * | merge-recursive: make a helper function for cleanup for handle_renamesElijah Newren2018-04-201-10/+13
| * | merge-recursive: split out code for determining diff_filepairsElijah Newren2018-04-201-22/+62
| * | merge-recursive: make !o->detect_rename codepath more obviousElijah Newren2018-04-201-2/+9
| * | merge-recursive: fix leaks of allocated renames and diff_filepairsElijah Newren2018-04-201-5/+15
| * | merge-recursive: introduce new functions to handle rename logicElijah Newren2018-04-201-10/+33
| * | merge-recursive: move the get_renames() functionElijah Newren2018-04-201-69/+70
| |/
* | Merge branch 'ds/lazy-load-trees'Junio C Hamano2018-05-231-2/+3
|\ \ | |/ |/|
| * treewide: replace maybe_tree with accessor methodsDerrick Stolee2018-04-111-2/+2
| * treewide: rename tree to maybe_treeDerrick Stolee2018-04-111-2/+3
* | Revert "Merge branch 'en/rename-directory-detection'"Junio C Hamano2018-04-111-1132/+111
* | Merge branch 'bc/object-id'Junio C Hamano2018-04-101-19/+19
|\ \
| * | sha1_file: convert read_sha1_file to struct object_idbrian m. carlson2018-03-141-2/+2
| * | tree-walk: convert tree entry functions to object_idbrian m. carlson2018-03-141-6/+6
| * | strbuf: convert strbuf_add_unique_abbrev to use struct object_idbrian m. carlson2018-03-141-1/+1
| * | tree: convert read_tree_recursive to struct object_idbrian m. carlson2018-03-141-1/+1
| |/
* | Merge branch 'en/rename-directory-detection'Junio C Hamano2018-04-101-111/+1132
|\ \
| * | merge-recursive: ensure we write updates for directory-renamed fileen/rename-directory-detectionElijah Newren2018-02-271-3/+1
| * | merge-recursive: avoid spurious rename/rename conflict from dir renamesElijah Newren2018-02-271-2/+2
| * | merge-recursive: fix remaining directory rename + dirty overwrite casesElijah Newren2018-02-271-3/+22
| * | merge-recursive: fix overwriting dirty files involved in renamesElijah Newren2018-02-271-19/+66
| * | merge-recursive: avoid clobbering untracked files with directory renamesElijah Newren2018-02-271-2/+40
| * | merge-recursive: apply necessary modifications for directory renamesElijah Newren2018-02-271-1/+186
| * | merge-recursive: when comparing files, don't include treesElijah Newren2018-02-141-6/+21
| * | merge-recursive: check for file level conflicts then get new nameElijah Newren2018-02-141-8/+166
| * | merge-recursive: add computation of collisions due to dir rename & mergingElijah Newren2018-02-141-3/+143
| * | merge-recursive: check for directory level conflictsElijah Newren2018-02-141-0/+119
| * | merge-recursive: add get_directory_renames()Elijah Newren2018-02-141-3/+221
View Lorry Controller Status