aboutsummaryrefslogtreecommitdiffstats
path: root/merge-recursive.c
AgeCommit message (Expand)AuthorFilesLines
2012-09-11Merge branch 'tr/void-diff-setup-done' into maint-1.7.11Junio C Hamano1-2/+1
2012-09-11Merge branch 'tr/merge-recursive-flush' into maint-1.7.11Junio C Hamano1-18/+1
2012-08-03merge-recursive: eliminate flush_buffer() in favor of write_in_full()Thomas Rast1-18/+1
2012-08-03diff_setup_done(): return voidThomas Rast1-2/+1
2012-04-16Merge branch 'jk/diff-no-rename-empty'Junio C Hamano1-1/+2
2012-04-15Merge branch 'jc/diff-algo-cleanup'Junio C Hamano1-2/+2
2012-03-23merge-recursive: don't detect renames of empty filesJeff King1-0/+1
2012-03-23drop casts from users EMPTY_TREE_SHA1_BINJeff King1-1/+1
2012-02-19xdiff: PATIENCE/HISTOGRAM are not independent option bitsJunio C Hamano1-2/+2
2012-02-07cache-tree: update API to take abitrary flagsNguyễn Thái Ngọc Duy1-1/+1
2011-12-19Merge branch 'tr/cache-tree'Junio C Hamano1-1/+1
2011-12-06Refactor cache_tree_update idiom from commitThomas Rast1-1/+1
2011-11-08merge: make usage of commit->util more extensibleJunio C Hamano1-7/+6
2011-10-13submodule: Search for merges only at end of recursive mergeBrad King1-2/+4
2011-10-05Merge branch 'cn/eradicate-working-copy'Junio C Hamano1-1/+1
2011-09-23merge-recursive: Do not look at working tree during a virtual ancestor mergeJunio C Hamano1-1/+1
2011-09-21Remove 'working copy' from the documentation and C codeCarlos Martín Nieto1-1/+1
2011-09-02Merge branch 'en/merge-recursive-2'Junio C Hamano1-384/+695
2011-08-25Merge branch 'jn/plug-empty-tree-leak'Junio C Hamano1-5/+3
2011-08-16merge-recursive: take advantage of hardcoded empty treeJonathan Nieder1-5/+3
2011-08-14merge-recursive: Don't re-sort a list whose order we depend uponElijah Newren1-4/+12
2011-08-14merge-recursive: Fix virtual merge base for rename/rename(1to2)/add-destElijah Newren1-2/+21
2011-08-14merge-recursive: Avoid unnecessary file rewritesElijah Newren1-6/+24
2011-08-14merge-recursive: Fix spurious 'refusing to lose untracked file...' messagesElijah Newren1-14/+20
2011-08-14merge-recursive: Fix working copy handling for rename/rename/add/addElijah Newren1-25/+48
2011-08-14merge-recursive: add handling for rename/rename/add-dest/add-destElijah Newren1-2/+19
2011-08-14merge-recursive: Have conflict_rename_delete reuse modify/delete codeElijah Newren1-16/+30
2011-08-14merge-recursive: Make modify/delete handling code reusableElijah Newren1-34/+48
2011-08-14merge-recursive: Consider modifications in rename/rename(2to1) conflictsElijah Newren1-9/+21
2011-08-14merge-recursive: Create function for merging with branchname:file markersElijah Newren1-9/+33
2011-08-14merge-recursive: Record more data needed for merging with dual renamesElijah Newren1-3/+39
2011-08-14merge-recursive: Defer rename/rename(2to1) handling until process_entryElijah Newren1-42/+62
2011-08-14merge-recursive: Small cleanups for conflict_rename_rename_1to2Elijah Newren1-33/+27
2011-08-14merge-recursive: Fix rename/rename(1to2) resolution for virtual merge baseElijah Newren1-17/+13
2011-08-14merge-recursive: Introduce a merge_file convenience functionElijah Newren1-35/+37
2011-08-14merge-recursive: Fix modify/delete resolution in the recursive caseElijah Newren1-14/+24
2011-08-14merge-recursive: When we detect we can skip an update, actually skip itElijah Newren1-3/+16
2011-08-14merge-recursive: Provide more info in conflict markers with file renamesElijah Newren1-3/+25
2011-08-14merge-recursive: Cleanup and consolidation of rename_conflict_infoElijah Newren1-68/+66
2011-08-14merge-recursive: Consolidate process_entry() and process_df_entry()Elijah Newren1-131/+57
2011-08-14merge-recursive: Improve handling of rename target vs. directory additionElijah Newren1-5/+22
2011-08-14merge-recursive: Add comments about handling rename/add-source casesElijah Newren1-0/+11
2011-08-14merge-recursive: Make dead code for rename/rename(2to1) conflicts undeadElijah Newren1-22/+48
2011-08-14merge-recursive: Fix deletion of untracked file in rename/delete conflictsElijah Newren1-1/+2
2011-08-14merge-recursive: Split update_stages_and_entry; only update stages at endElijah Newren1-18/+17
2011-08-14merge-recursive: Allow make_room_for_path() to remove D/F entriesElijah Newren1-4/+22
2011-08-14merge-recursive: Split was_tracked() out of would_lose_untracked()Elijah Newren1-3/+8
2011-08-14merge-recursive: Save D/F conflict filenames instead of unlinking themElijah Newren1-16/+24
2011-08-14merge-recursive: Fix code checking for D/F conflicts still being presentElijah Newren1-15/+34
2011-08-14merge-recursive: Fix sorting order and directory change assumptionsElijah Newren1-5/+35
2011-08-14merge-recursive: Fix recursive case with D/F conflict via add/add conflictElijah Newren1-0/+2
2011-08-14merge-recursive: Avoid working directory changes during recursive caseElijah Newren1-0/+7
2011-08-14merge-recursive: Remember to free generated unique path namesElijah Newren1-8/+12
2011-08-14merge-recursive: Consolidate different update_stages functionsElijah Newren1-18/+9
2011-08-14merge-recursive: Mark some diff_filespec struct arguments constElijah Newren1-9/+10
2011-08-14merge-recursive: Correct a commentElijah Newren1-1/+1
2011-08-14merge-recursive: Make BUG message more legible by adding a newlineElijah Newren1-1/+1
2011-07-12teach --histogram to diffTay Ray Chuan1-0/+2
2011-05-31Merge branch 'jc/rename-degrade-cc-to-c' into maintJunio C Hamano1-7/+3
2011-05-19Revert "Merge branch 'en/merge-recursive'"Junio C Hamano1-18/+6
2011-05-14Merge branch 'maint'Junio C Hamano1-3/+3
2011-05-14add, merge, diff: do not use strcasecmp to compare config variable namesJonathan Nieder1-3/+3
2011-05-06Merge branch 'nd/struct-pathspec'Junio C Hamano1-1/+3
2011-04-28Merge branch 'jc/rename-degrade-cc-to-c'Junio C Hamano1-7/+3
2011-04-28Merge branch 'en/merge-recursive'Junio C Hamano1-6/+18
2011-04-03Fix two unused variable warnings in gcc 4.6Dan McGee1-4/+0
2011-03-25Convert read_tree{,_recursive} to support struct pathspecNguyễn Thái Ngọc Duy1-1/+3
2011-03-22diffcore-rename: fall back to -C when -C -C busts the rename limitJunio C Hamano1-7/+3
2011-03-19Merge branch 'jk/merge-rename-ux'Junio C Hamano1-2/+11
2011-03-17merge-recursive: tweak magic band-aidJunio C Hamano1-1/+8
2011-03-16Merge branch 'maint'Junio C Hamano1-8/+4
2011-03-16standardize brace placement in struct definitionsJonathan Nieder1-8/+4
2011-03-02merge-recursive: When we detect we can skip an update, actually skip itElijah Newren1-6/+11
2011-02-26strbuf: add strbuf_vaddfJeff King1-14/+1
2011-02-21merge: enable progress reporting for rename detectionJeff King1-0/+1
2011-02-21bump rename limit defaults (again)Jeff King1-1/+1
2011-02-21merge: improve inexact rename limit warningJeff King1-1/+9
2010-11-29Merge branch 'en/merge-recursive'Junio C Hamano1-223/+429
2010-10-26Merge branch 'kb/merge-recursive-rename-threshold'Junio C Hamano1-0/+6
2010-10-26Merge branch 'jf/merge-ignore-ws'Junio C Hamano1-11/+41
2010-10-21merge-recursive:make_room_for_directories - work around dumb compilersJunio C Hamano1-1/+1
2010-09-29merge-recursive: Remove redundant path clearing for D/F conflictsElijah Newren1-15/+2
2010-09-29merge-recursive: Make room for directories in D/F conflictsElijah Newren1-0/+58
2010-09-29handle_delete_modify(): Check whether D/F conflicts are still presentElijah Newren1-9/+16
2010-09-29merge_content(): Check whether D/F conflicts are still presentElijah Newren1-2/+20
2010-09-29conflict_rename_rename_1to2(): Fix checks for presence of D/F conflictsElijah Newren1-4/+3
2010-09-29conflict_rename_delete(): Check whether D/F conflicts are still presentElijah Newren1-0/+8
2010-09-29merge-recursive: Delay modify/delete conflicts if D/F conflict presentElijah Newren1-0/+9
2010-09-29merge-recursive: Delay content merging for renamesElijah Newren1-36/+15
2010-09-29merge-recursive: Delay handling of rename/delete conflictsElijah Newren1-2/+20
2010-09-29merge-recursive: Move handling of double rename of one file to other fileElijah Newren1-26/+6
2010-09-29merge-recursive: Move handling of double rename of one file to twoElijah Newren1-16/+41
2010-09-29merge-recursive: Avoid doubly merging rename/add conflict contentsElijah Newren1-0/+1
2010-09-29merge-recursive: Update merge_content() call signatureElijah Newren1-2/+4
2010-09-29merge-recursive: Update conflict_rename_rename_1to2() call signatureElijah Newren1-9/+9
2010-09-29merge-recursive: Structure process_df_entry() to handle more casesElijah Newren1-36/+47
2010-09-29merge-recursive: Have process_entry() skip D/F or rename entriesElijah Newren1-0/+3
2010-09-29merge-recursive: New function to assist resolving renames in-core onlyElijah Newren1-3/+30
2010-09-29merge-recursive: New data structures for deferring of D/F conflictsElijah Newren1-0/+44
2010-09-29merge-recursive: Move process_entry's content merging into a functionElijah Newren1-28/+43
2010-09-29merge-recursive: Move delete/modify handling into dedicated functionElijah Newren1-13/+22
2010-09-29merge-recursive: Move rename/delete handling into dedicated functionElijah Newren1-11/+20
2010-09-29merge-recursive: Nuke rename/directory conflict detectionElijah Newren1-18/+0
2010-09-29merge-recursive: Rename conflict_rename_rename*() for clarityElijah Newren1-12/+14
2010-09-29merge-recursive: Small code clarification -- variable name and commentsElijah Newren1-6/+14
2010-09-29merge-recursive: Restructure showing how to chain more process_* functionsJunio C Hamano1-3/+8
2010-09-29Merge branch 'en/rename-d-f' into en/merge-recursiveJunio C Hamano1-8/+8
2010-09-29merge-recursive: option to specify rename thresholdKevin Ballard1-0/+6
2010-09-15Merge branch 'ks/recursive-rename-add-identical'Junio C Hamano1-0/+6
2010-09-09merge-recursive: D/F conflicts where was_a_dir/file -> was_a_dirElijah Newren1-8/+8
2010-09-03Merge branch 'dg/local-mod-error-messages'Junio C Hamano1-45/+1
2010-09-03RE: [PATCH] Avoid rename/add conflict when contents are identicalSchalk, Ken1-0/+6
2010-09-03Merge branch 'jn/merge-renormalize'Junio C Hamano1-3/+54
2010-09-03setup_unpack_trees_porcelain: take the whole options struct as parameterMatthieu Moy1-1/+1
2010-09-03Move set_porcelain_error_msgs to unpack-trees.c and rename itMatthieu Moy1-45/+1
2010-08-31Merge branch 'en/d-f-conflict-fix'Junio C Hamano1-19/+88
2010-08-27merge-recursive: options to ignore whitespace changesJustin Frankel1-0/+6
2010-08-26merge-recursive --patienceJustin Frankel1-0/+3
2010-08-26ll-merge: replace flag argument with options structJonathan Nieder1-11/+11
2010-08-26merge-recursive: expose merge options for builtin mergeJonathan Nieder1-0/+21
2010-08-21Merge branch 'hv/submodule-find-ff-merge'Junio C Hamano1-3/+6
2010-08-21Merge branch 'dg/local-mod-error-messages'Junio C Hamano1-20/+42
2010-08-20merge-recursive: Avoid excessive output for and reprocessing of renamesElijah Newren1-6/+2
2010-08-18Merge branch 'tf/string-list-init'Junio C Hamano1-1/+2
2010-08-18Merge branch 'cc/find-commit-subject'Junio C Hamano1-10/+4
2010-08-18merge-recursive: Fix multiple file rename across D/F conflictElijah Newren1-0/+1
2010-08-18merge-recursive: Fix typoElijah Newren1-1/+1
2010-08-11unpack_trees: group error messages by typeMatthieu Moy1-6/+19
2010-08-11merge-recursive: distinguish "removed" and "overwritten" messagesMatthieu Moy1-5/+8
2010-08-11merge-recursive: porcelain messages for checkoutDiane Gasselin1-9/+22
2010-08-11Turn unpack_trees_options.msgs into an array + enumMatthieu Moy1-18/+11
2010-08-06merge-recursive --renormalizeJonathan Nieder1-1/+1
2010-08-06ll-merge: let caller decide whether to renormalizeJonathan Nieder1-0/+1
2010-08-06ll-merge: make flag easier to populateJonathan Nieder1-1/+2
2010-08-06merge-trees: let caller decide whether to renormalizeJonathan Nieder1-1/+2
2010-08-06merge-trees: push choice to renormalize away from low levelJonathan Nieder1-4/+5
2010-07-23merge-recursive: use find_commit_subject() instead of custom codeChristian Couder1-10/+4
2010-07-09merge-recursive: use "up-to-date" instead of "uptodate" in error message for ...Nicolas Sebrecht1-1/+1
2010-07-09merge_recursive: Fix renames across paths below D/F conflictsElijah Newren1-2/+13
2010-07-09merge-recursive: Fix D/F conflictsElijah Newren1-16/+77
2010-07-07Implement automatic fast-forward merge for submodulesHeiko Voigt1-3/+6
2010-07-05string_list: Add STRING_LIST_INIT macro and make use of it.Thiago Farina1-1/+2
2010-07-02Try normalizing files to avoid delete/modify conflicts when mergingEyvind Bernhardsen1-2/+49
2010-06-27string_list: Fix argument order for string_list_lookupJulian Phillips1-4/+4
2010-06-27string_list: Fix argument order for string_list_insertJulian Phillips1-8/+8
2010-06-22Merge branch 'pc/remove-warn' into maintJunio C Hamano1-1/+1
2010-05-08Merge branch 'pc/remove-warn'Junio C Hamano1-1/+1
2010-03-28Remove a redundant errno test in a usage of remove_pathPeter Collingbourne1-1/+1
2010-03-20merge-recursive: add a label for ancestorJonathan Nieder1-0/+1
2010-03-20merge_trees(): add ancestor label parameter for diff3-style outputJonathan Nieder1-3/+8
2010-03-20ll_merge(): add ancestor label parameter for diff3-style outputJonathan Nieder1-1/+1
2010-02-17refactor duplicated fill_mm() in checkout and merge-recursiveMichael Lukashov1-20/+3
2010-01-21Merge branch 'maint'Junio C Hamano1-4/+4
2010-01-21merge-recursive: do not return NULL only to cause segfaultJunio C Hamano1-4/+4
2010-01-20Merge branch 'ap/merge-backend-opts'Junio C Hamano1-10/+29
2010-01-17Make "subtree" part more orthogonal to the rest of merge-recursive.Junio C Hamano1-9/+11
2010-01-17git merge -X<option>Avery Pennarun1-2/+19
2009-11-30Merge branch 'mm/maint-merge-ff-error-message-fix'Junio C Hamano1-18/+23
2009-11-29merge-recursive: make the error-message generation an extern functionMatthieu Moy1-13/+18
2009-11-23Merge branch 'mm/maint-hint-failed-merge'Junio C Hamano1-1/+7
2009-11-22merge-recursive: point the user to commit when file would be overwritten.Matthieu Moy1-1/+7
2009-11-15Check the format of more printf-type functionsTarmigan Casebolt1-1/+3
2009-09-08merge-recursive: give less scary messages when merge did not startJunio C Hamano1-4/+21
2009-08-10Merge branch 'jc/maint-merge-recursive-fix'Junio C Hamano1-3/+25
2009-07-30merge-recursive: don't segfault while handling rename clashesJunio C Hamano1-3/+25
2009-07-06Merge branch 'tr/die_errno'Junio C Hamano1-3/+3
2009-07-01Remove filename from conflict markersMartin Renold1-2/+7
2009-06-27Convert existing die(..., strerror(errno)) to die_errno()Thomas Rast1-3/+3
2009-06-20Fix various sparse warnings in the git source codeLinus Torvalds1-1/+1
2009-05-23Merge branch 'do/maint-merge-recursive-fix'Junio C Hamano1-5/+6
2009-05-09merge-recursive: never leave index unmerged while recursingDave Olszewski1-5/+6
2009-04-29merge-recursive: do not die on a conflicting submoduleJunio C Hamano1-2/+6
2009-04-07Merge branch 'cb/maint-merge-recursive-submodule-fix'Junio C Hamano1-12/+4
2009-04-05simplify output of conflicting mergeClemens Buchacher1-13/+4
2009-04-05update cache for conflicting submodule entriesClemens Buchacher1-2/+3
2009-03-15Fix various dead stores found by the clang static analyzerBenjamin Kramer1-8/+3
2009-02-07tree.c: allow read_tree_recursive() to traverse gitlink entriesLars Hjemli1-1/+1
2009-01-13Merge branch 'js/maint-merge-recursive-r-d-conflict' into maintJunio C Hamano1-0/+5
2009-01-13Merge branch 'cb/maint-merge-recursive-fix' into maintJunio C Hamano1-0/+32
2009-01-07Merge branch 'js/maint-merge-recursive-r-d-conflict'Junio C Hamano1-0/+5
2008-12-24merge-recursive: mark rename/delete conflict as unmergedJohannes Schindelin1-0/+5
2008-12-15Merge branch 'cb/maint-merge-recursive-fix' into cb/merge-recursive-fixJunio C Hamano1-0/+32
2008-12-04Report symlink failures in merge-recursiveAlex Riesen1-1/+2
2008-11-23merge-recursive: use strbuf_expand() instead of interpolate()René Scharfe1-1/+0
2008-10-19git-merge-recursive: honor merge.conflictstyle once againMatt McCutchen1-1/+1
2008-10-12Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT initializerBrandon Casey1-2/+1
2008-09-29Merge branch 'bc/master-diff-hunk-header-fix'Shawn O. Pearce1-16/+1
2008-09-26Merge branch 'maint'Shawn O. Pearce1-3/+1
2008-09-26Cleanup remove_pathAlex Riesen1-5/+3
2008-09-05merge-recursive: get rid of virtual_idMiklos Vajna1-5/+1
2008-09-04merge-recursive: move current_{file,directory}_set to struct merge_optionsMiklos Vajna1-27/+30
2008-09-04merge-recursive: move the global obuf to struct merge_optionsMiklos Vajna1-19/+18
2008-09-04merge-recursive: get rid of the index_only global variableMiklos Vajna1-73/+67
2008-09-03merge-recursive: move call_depth to struct merge_optionsMiklos Vajna1-13/+12
2008-08-30merge-recursive: introduce merge_optionsMiklos Vajna1-132/+133
2008-08-30merge-recursive.c: Add more generic merge_recursive_generic()Stephan Beyer1-0/+53
2008-08-30Split out merge_recursive() to merge-recursive.cMiklos Vajna1-0/+1331
2008-02-09Build-in merge-recursiveDaniel Barkalow1-1760/+0
2008-01-21Make on-disk index representation separate from in-core oneLinus Torvalds1-1/+1
2008-01-16Improve use of lockfile APIBrandon Casey1-1/+1
generated by cgit 1.2.3-korg (git 2.43.0) at 2025-12-09 04:34:55 +0000