aboutsummaryrefslogtreecommitdiffstats
path: root/merge-recursive.c
AgeCommit message (Expand)AuthorFilesLines
2019-03-07Merge branch 'nd/completion-more-parameters'Junio C Hamano1-0/+4
2019-02-20completion: add more parameter value completionNguyễn Thái Ngọc Duy1-0/+4
2019-02-14merge-recursive: drop several unused parametersJeff King1-12/+7
2019-02-06Merge branch 'nd/the-index-final'Junio C Hamano1-88/+103
2019-01-14Merge branch 'nd/attr-pathspec-in-tree-walk'Junio C Hamano1-1/+2
2019-01-14read-cache.c: remove the_* from index_has_changes()Nguyễn Thái Ngọc Duy1-1/+1
2019-01-14merge-recursive.c: remove implicit dependency on the_repositoryNguyễn Thái Ngọc Duy1-21/+24
2019-01-14merge-recursive.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy1-68/+80
2019-01-14read-cache.c: kill read_index()Nguyễn Thái Ngọc Duy1-1/+1
2019-01-14repository.c: replace hold_locked_index() with repo_hold_locked_index()Nguyễn Thái Ngọc Duy1-1/+1
2019-01-04Merge branch 'en/merge-path-collision'Junio C Hamano1-213/+316
2018-11-19tree.c: make read_tree*() take 'struct repository *'Nguyễn Thái Ngọc Duy1-1/+2
2018-11-08merge-recursive: combine error handlingDerrick Stolee1-26/+27
2018-11-08merge-recursive: improve rename/rename(1to2)/add[/add] handlingElijah Newren1-77/+77
2018-11-08merge-recursive: use handle_file_collision for add/add conflictsElijah Newren1-8/+21
2018-11-08merge-recursive: improve handling for rename/rename(2to1) conflictsElijah Newren1-90/+14
2018-11-08merge-recursive: fix rename/add conflict handlingElijah Newren1-51/+86
2018-11-08merge-recursive: new function for better colliding conflict resolutionsElijah Newren1-0/+121
2018-11-08merge-recursive: increase marker length with depth of recursionElijah Newren1-8/+17
2018-11-03Merge branch 'en/merge-cleanup-more'Junio C Hamano1-3/+33
2018-10-19Merge branch 'nd/the-index'Junio C Hamano1-3/+4
2018-10-18merge-recursive: avoid showing conflicts with merge branch before HEADElijah Newren1-1/+31
2018-10-18merge-recursive: improve auto-merging messages with path collisionsElijah Newren1-2/+2
2018-10-16Merge branch 'en/merge-cleanup'Junio C Hamano1-93/+51
2018-09-24Merge branch 'en/double-semicolon-fix'Junio C Hamano1-1/+1
2018-09-21revision.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy1-1/+1
2018-09-21ll-merge.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy1-1/+2
2018-09-21diff.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy1-1/+1
2018-09-20merge-recursive: rename merge_file_1() and merge_content()Elijah Newren1-32/+34
2018-09-20merge-recursive: remove final remaining caller of merge_file_one()Elijah Newren1-27/+17
2018-09-20merge-recursive: avoid wrapper function when unnecessary and wastefulElijah Newren1-4/+1
2018-09-20merge-recursive: set paths correctly when three-way merging contentElijah Newren1-40/+9
2018-09-17Merge branch 'jk/cocci'Junio C Hamano1-2/+2
2018-09-17Merge branch 'ds/reachable'Junio C Hamano1-0/+1
2018-09-05Remove superfluous trailing semicolonsElijah Newren1-1/+1
2018-09-04Merge branch 'en/directory-renames-nothanks'Junio C Hamano1-5/+13
2018-08-30merge-recursive: add ability to turn off directory rename detectionElijah Newren1-5/+13
2018-08-29convert "oidcmp() == 0" to oideq()Jeff King1-2/+2
2018-08-20Merge branch 'nd/no-the-index'Junio C Hamano1-1/+1
2018-08-15Merge branch 'en/merge-recursive-skip-fix'Junio C Hamano1-0/+16
2018-08-13convert.c: remove an implicit dependency on the_indexNguyễn Thái Ngọc Duy1-1/+1
2018-08-02Merge branch 'en/dirty-merge-fixes'Junio C Hamano1-7/+7
2018-08-02Merge branch 'jm/cache-entry-from-mem-pool'Junio C Hamano1-2/+2
2018-08-02Merge branch 'sb/object-store-lookup'Junio C Hamano1-7/+10
2018-07-27merge-recursive: preserve skip_worktree bit when necessaryElijah Newren1-0/+16
2018-07-20commit.h: remove method declarationsDerrick Stolee1-0/+1
2018-07-18Merge branch 'sb/object-store-grafts'Junio C Hamano1-0/+1
2018-07-18Merge branch 'en/merge-recursive-cleanup'Junio C Hamano1-82/+104
2018-07-11merge-recursive: enforce rule that index matches head before mergingElijah Newren1-7/+7
2018-07-11merge-recursive: fix assumption that head tree being merged is HEADElijah Newren1-1/+1
2018-07-11merge-recursive: make sure when we say we abort that we actually abortElijah Newren1-2/+2
2018-07-03index_has_changes(): avoid assuming operating on the_indexElijah Newren1-1/+1
2018-07-03block alloc: add lifecycle APIs for cache_entry structsJameson Miller1-1/+1
2018-07-03read-cache: teach make_cache_entry to take object_idJameson Miller1-1/+1
2018-07-03read-cache: teach refresh_cache_entry to take istateJameson Miller1-1/+1
2018-06-29tag: add repository argument to deref_tagStefan Beller1-1/+2
2018-06-29commit: add repository argument to lookup_commit_referenceStefan Beller1-3/+3
2018-06-29tree: add repository argument to lookup_treeStefan Beller1-3/+3
2018-06-29object: add repository argument to parse_objectStefan Beller1-1/+3
2018-06-29Merge branch 'sb/object-store-grafts' into sb/object-store-lookupJunio C Hamano1-0/+1
2018-06-25Merge branch 'sb/object-store-alloc'Junio C Hamano1-1/+2
2018-06-25Merge branch 'nd/commit-util-to-slab'Junio C Hamano1-3/+5
2018-06-18Merge branch 'en/rename-directory-detection'Junio C Hamano1-5/+5
2018-06-14merge-recursive: use xstrdup() instead of fixed bufferRené Scharfe1-5/+5
2018-06-13Merge branch 'sb/submodule-merge-in-merge-recursive'Junio C Hamano1-2/+2
2018-06-12merge-recursive: add pointer about unduly complex looking codeElijah Newren1-0/+15
2018-06-12merge-recursive: rename conflict_rename_*() family of functionsElijah Newren1-43/+43
2018-06-12merge-recursive: clarify the rename_dir/RENAME_DIR meaningElijah Newren1-11/+17
2018-06-12merge-recursive: align labels with their respective code blocksElijah Newren1-3/+3
2018-06-12merge-recursive: fix numerous argument alignment issuesElijah Newren1-37/+38
2018-06-12merge-recursive: fix miscellaneous grammar error in commentElijah Newren1-1/+1
2018-06-11merge-submodule: reduce output verbosityLeif Middelschulte1-2/+2
2018-05-30Merge branch 'ma/unpack-trees-free-msgs'Junio C Hamano1-14/+16
2018-05-30Merge branch 'sb/submodule-merge-in-merge-recursive'Junio C Hamano1-3/+182
2018-05-30Merge branch 'js/use-bug-macro'Junio C Hamano1-6/+6
2018-05-30Merge branch 'bp/merge-rename-config'Junio C Hamano1-6/+25
2018-05-23Merge branch 'en/rename-directory-detection-reboot'Junio C Hamano1-170/+1262
2018-05-23Merge branch 'ds/lazy-load-trees'Junio C Hamano1-2/+3
2018-05-22unpack_trees_options: free messages when doneMartin Ågren1-0/+1
2018-05-21merge: use commit-slab in merge remote desc instead of commit->utilNguyễn Thái Ngọc Duy1-3/+5
2018-05-21merge-recursive: provide pair of `unpack_trees_{start,finish}()`Elijah Newren1-14/+15
2018-05-18merge-recursive: give notice when submodule commit gets fast-forwardedLeif Middelschulte1-0/+16
2018-05-16object-store: move object access functions to object-store.hStefan Beller1-0/+1
2018-05-16alloc: allow arbitrary repositories for alloc functionsStefan Beller1-0/+1
2018-05-16merge-recursive: i18n submodule merge output and respect verbosityStefan Beller1-18/+15
2018-05-16submodule.c: move submodule merging to merge-recursive.cStefan Beller1-0/+166
2018-05-09alloc: add repository argument to alloc_commit_nodeStefan Beller1-1/+1
2018-05-08merge: pass aggressive when rename detection is turned offBen Peart1-0/+1
2018-05-08merge: add merge.renames config settingBen Peart1-6/+24
2018-05-08merge-recursive: fix check for skipability of working tree updatesElijah Newren1-16/+32
2018-05-08merge-recursive: make "Auto-merging" comment show for other mergesElijah Newren1-26/+39
2018-05-08merge-recursive: fix remainder of was_dirty() to use original indexElijah Newren1-3/+3
2018-05-08merge-recursive: fix was_tracked() to quit lying with some renamed pathsElijah Newren1-24/+67
2018-05-08merge-recursive: avoid triggering add_cacheinfo error with dirty modElijah Newren1-1/+1
2018-05-08merge-recursive: move more is_dirty handling to merge_contentElijah Newren1-18/+12
2018-05-08merge-recursive: improve add_cacheinfo error handlingElijah Newren1-5/+8
2018-05-08merge-recursive: avoid spurious rename/rename conflict from dir renamesElijah Newren1-2/+2
2018-05-08merge-recursive: fix remaining directory rename + dirty overwrite casesElijah Newren1-3/+22
2018-05-08merge-recursive: fix overwriting dirty files involved in renamesElijah Newren1-19/+66
2018-05-08merge-recursive: avoid clobbering untracked files with directory renamesElijah Newren1-2/+40
2018-05-08merge-recursive: apply necessary modifications for directory renamesElijah Newren1-1/+186
2018-05-08merge-recursive: when comparing files, don't include treesElijah Newren1-6/+21
2018-05-08merge-recursive: check for file level conflicts then get new nameElijah Newren1-8/+166
2018-05-08merge-recursive: add computation of collisions due to dir rename & mergingElijah Newren1-3/+143
2018-05-08merge-recursive: check for directory level conflictsElijah Newren1-0/+119
2018-05-08merge-recursive: add get_directory_renames()Elijah Newren1-3/+221
2018-05-06Replace all die("BUG: ...") calls by BUG() onesJohannes Schindelin1-6/+6
2018-04-20merge-recursive: make a helper function for cleanup for handle_renamesElijah Newren1-10/+13
2018-04-20merge-recursive: split out code for determining diff_filepairsElijah Newren1-22/+62
2018-04-20merge-recursive: make !o->detect_rename codepath more obviousElijah Newren1-2/+9
2018-04-20merge-recursive: fix leaks of allocated renames and diff_filepairsElijah Newren1-5/+15
2018-04-20merge-recursive: introduce new functions to handle rename logicElijah Newren1-10/+33
2018-04-20merge-recursive: move the get_renames() functionElijah Newren1-69/+70
2018-04-11Revert "Merge branch 'en/rename-directory-detection'"Junio C Hamano1-1132/+111
2018-04-11treewide: replace maybe_tree with accessor methodsDerrick Stolee1-2/+2
2018-04-11treewide: rename tree to maybe_treeDerrick Stolee1-2/+3
2018-04-10Merge branch 'bc/object-id'Junio C Hamano1-19/+19
2018-04-10Merge branch 'en/rename-directory-detection'Junio C Hamano1-111/+1132
2018-03-21Merge branch 'rj/warning-uninitialized-fix'Junio C Hamano1-1/+1
2018-03-20-Wuninitialized: remove some 'init-self' workaroundsRamsay Jones1-1/+1
2018-03-14sha1_file: convert read_sha1_file to struct object_idbrian m. carlson1-2/+2
2018-03-14tree-walk: convert tree entry functions to object_idbrian m. carlson1-6/+6
2018-03-14strbuf: convert strbuf_add_unique_abbrev to use struct object_idbrian m. carlson1-1/+1
2018-03-14tree: convert read_tree_recursive to struct object_idbrian m. carlson1-1/+1
2018-03-01write_locked_index(): add flag to avoid writing unchanged indexMartin Ågren1-3/+2
2018-02-28merge-recursive: always roll back lock in `merge_recursive_generic()`Martin Ågren1-1/+4
2018-02-27merge-recursive: ensure we write updates for directory-renamed fileElijah Newren1-3/+1
2018-02-27merge-recursive: avoid spurious rename/rename conflict from dir renamesElijah Newren1-2/+2
2018-02-27merge-recursive: fix remaining directory rename + dirty overwrite casesElijah Newren1-3/+22
2018-02-27merge-recursive: fix overwriting dirty files involved in renamesElijah Newren1-19/+66
2018-02-27merge-recursive: avoid clobbering untracked files with directory renamesElijah Newren1-2/+40
2018-02-27merge-recursive: apply necessary modifications for directory renamesElijah Newren1-1/+186
2018-02-15Merge branch 'jc/merge-symlink-ours-theirs' into maintJunio C Hamano1-4/+13
2018-02-15Merge branch 'po/object-id'Junio C Hamano1-2/+3
2018-02-15Merge branch 'en/merge-recursive-fixes'Junio C Hamano1-1/+20
2018-02-14merge-recursive: when comparing files, don't include treesElijah Newren1-6/+21
2018-02-14merge-recursive: check for file level conflicts then get new nameElijah Newren1-8/+166
2018-02-14merge-recursive: add computation of collisions due to dir rename & mergingElijah Newren1-3/+143
2018-02-14merge-recursive: check for directory level conflictsElijah Newren1-0/+119
2018-02-14merge-recursive: add get_directory_renames()Elijah Newren1-3/+221
2018-02-14merge-recursive: make a helper function for cleanup for handle_renamesElijah Newren1-10/+13
2018-02-14merge-recursive: split out code for determining diff_filepairsElijah Newren1-22/+62
2018-02-14merge-recursive: make !o->detect_rename codepath more obviousElijah Newren1-2/+9
2018-02-14merge-recursive: fix leaks of allocated renames and diff_filepairsElijah Newren1-5/+15
2018-02-14merge-recursive: introduce new functions to handle rename logicElijah Newren1-10/+33
2018-02-14merge-recursive: move the get_renames() functionElijah Newren1-69/+70
2018-01-30sha1_file: convert write_sha1_file to object_idPatryk Obara1-2/+3
2018-01-23Merge branch 'jc/merge-symlink-ours-theirs'Junio C Hamano1-4/+13
2018-01-19merge-recursive: add explanation for src_entry and dst_entryElijah Newren1-0/+19
2018-01-19merge-recursive: fix logic ordering issueElijah Newren1-1/+1
2018-01-09Merge branch 'ew/empty-merge-with-dirty-index-maint' into ew/empty-merge-with...Junio C Hamano1-1/+1
2018-01-09merge-recursive: do not look at the index during recursive mergeJunio C Hamano1-1/+1
2018-01-03merge: teach -Xours/-Xtheirs to symbolic link mergeJunio C Hamano1-4/+13
2017-12-22Merge branch 'ew/empty-merge-with-dirty-index-maint' into ew/empty-merge-with...Junio C Hamano1-0/+7
2017-12-22merge-recursive: avoid incorporating uncommitted changes in a mergeElijah Newren1-0/+7
2017-12-19Merge branch 'en/merge-recursive-icase-removal'Junio C Hamano1-1/+1
2017-12-13Merge branch 'bc/hash-algo'Junio C Hamano1-1/+1
2017-11-27Merge branch 'sb/test-cherry-pick-submodule-getting-in-a-way'Junio C Hamano1-2/+3
2017-11-27Merge branch 'jc/ignore-cr-at-eol'Junio C Hamano1-0/+2
2017-11-27merge-recursive: ignore_case shouldn't reject intentional removalsElijah Newren1-1/+1
2017-11-15merge-recursive: handle addition of submodule on our side of historyElijah Newren1-2/+3
2017-11-15Merge branch 'ao/merge-verbosity-getenv-just-once'Junio C Hamano1-3/+4
2017-11-13Switch empty tree and blob lookups to use hash abstractionbrian m. carlson1-1/+1
2017-11-09Merge branch 'bw/diff-opt-impl-to-bitfields'Junio C Hamano1-2/+2
2017-11-08diff: --ignore-cr-at-eolJunio C Hamano1-0/+2
2017-11-01diff: make struct diff_flags members lowercaseBrandon Williams1-2/+2
2017-11-01diff: remove DIFF_OPT_CLR macroBrandon Williams1-1/+1
2017-11-01diff: remove DIFF_OPT_SET macroBrandon Williams1-1/+1
2017-11-01merge-recursive: check GIT_MERGE_VERBOSITY only onceAndrey Okoshkin1-3/+4
2017-10-06treewide: prefer lockfiles on the stackMartin Ågren1-3/+3
2017-09-19Merge branch 'kw/merge-recursive-cleanup'Junio C Hamano1-20/+56
2017-09-08merge-recursive: change current file dir string_lists to hashmapKevin Willford1-11/+45
2017-09-06merge-recursive: remove return value from get_files_dirsKevin Willford1-6/+2
2017-09-06merge-recursive: fix memory leakKevin Willford1-3/+9
2017-08-23treewide: correct several "up-to-date" to "up to date"Martin Ågren1-1/+1
2017-07-06Merge branch 'sb/merge-recursive-code-cleanup'Junio C Hamano1-3/+3
2017-06-30merge-recursive: use DIFF_XDL_SET macroStefan Beller1-3/+3
2017-06-24Merge branch 'bw/config-h'Junio C Hamano1-0/+1
2017-06-24Merge branch 'bw/ls-files-sans-the-index'Junio C Hamano1-2/+2
2017-06-15config: don't include config.h by defaultBrandon Williams1-0/+1
2017-06-13convert: convert renormalize_buffer to take an indexBrandon Williams1-2/+2
2017-06-05diff-tree: convert diff_tree_sha1 to struct object_idBrandon Williams1-1/+1
2017-05-08object: convert parse_object* to take struct object_idbrian m. carlson1-1/+1
2017-05-08Convert lookup_tree to struct object_idbrian m. carlson1-3/+3
2017-05-08submodule: convert merge_submodule to use struct object_idbrian m. carlson1-4/+4
2017-05-02Convert struct cache_tree to use struct object_idbrian m. carlson1-1/+1
2017-02-27Merge branch 'mm/merge-rename-delete-message'Junio C Hamano1-54/+63
2017-01-30use SWAP macroRené Scharfe1-4/+1
2017-01-30merge-recursive: make "CONFLICT (rename/delete)" message show both pathsMatt McCutchen1-54/+63
2017-01-17Merge branch 'nd/qsort-in-merge-recursive' into maintJunio C Hamano1-9/+7
2017-01-17Merge branch 'jc/renormalize-merge-kill-safer-crlf' into maintJunio C Hamano1-0/+2
2016-12-19Merge branch 'jc/lock-report-on-error'Junio C Hamano1-1/+1
2016-12-19Merge branch 'jc/renormalize-merge-kill-safer-crlf'Junio C Hamano1-0/+2
2016-12-16Merge branch 'nd/qsort-in-merge-recursive'Junio C Hamano1-9/+7
2016-12-07hold_locked_index(): align error handling with hold_lockfile_for_update()Junio C Hamano1-1/+1
2016-11-28merge-recursive.c: use string_list_sort instead of qsortNguyễn Thái Ngọc Duy1-9/+7
2016-11-28merge-recursive: handle NULL in add_cacheinfo() correctlyJohannes Schindelin1-0/+2
2016-11-17submodules: allow empty working-tree dirs in merge/cherry-pickDavid Turner1-6/+15
2016-10-17Merge branch 'rs/cocci'Junio C Hamano1-3/+3
2016-10-10use strbuf_add_unique_abbrev() for adding short hashes, part 3René Scharfe1-3/+3
generated by cgit 1.2.3-korg (git 2.43.0) at 2025-12-06 18:49:48 +0000