aboutsummaryrefslogtreecommitdiffstats
path: root/merge-recursive.c
AgeCommit message (Expand)AuthorFilesLines
2018-01-23Merge branch 'jc/merge-symlink-ours-theirs'Junio C Hamano1-4/+13
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
2016-09-26Merge branch 'rs/cocci'Junio C Hamano1-1/+1
2016-09-15use strbuf_addstr() for adding constant strings to a strbuf, part 2René Scharfe1-1/+1
2016-09-07Convert read_mmblob to take struct object_id.brian m. carlson1-3/+3
2016-09-07cache: convert struct cache_entry to use struct object_idbrian m. carlson1-1/+1
2016-08-19Merge branch 'rs/pull-signed-tag'Junio C Hamano1-4/+1
2016-08-13merge-recursive: fix verbose output for multiple base treesRené Scharfe1-4/+1
2016-08-12Merge branch 'rs/merge-recursive-string-list-init'Junio C Hamano1-2/+1
2016-08-05merge-recursive: use STRING_LIST_INIT_NODUPRené Scharfe1-2/+1
2016-08-01merge-recursive: flush output buffer even when erroring outJohannes Schindelin1-1/+3
2016-08-01merge_trees(): ensure that the callers release output bufferJohannes Schindelin1-0/+2
2016-08-01merge-recursive: offer an option to retain the output in 'obuf'Johannes Schindelin1-4/+13
2016-08-01merge-recursive: write the commit title in one goJohannes Schindelin1-8/+9
2016-08-01merge-recursive: flush output buffer before printing error messagesJohannes Schindelin1-48/+68
2016-07-26merge-recursive: switch to returning errors instead of dyingJohannes Schindelin1-27/+35
2016-07-26merge-recursive: handle return values indicating errorsJohannes Schindelin1-102/+150
2016-07-26merge-recursive: allow write_tree_from_memory() to error outJohannes Schindelin1-2/+2
2016-07-26merge-recursive: avoid returning a wholesale structJohannes Schindelin1-50/+56
2016-07-26merge_recursive: abort properly upon errorsJohannes Schindelin1-5/+12
2016-07-26merge-recursive: clarify code in was_tracked()Johannes Schindelin1-16/+14
2016-07-26die(_("BUG")): avoid translating bug messagesJohannes Schindelin1-3/+3
2016-07-26die("bug"): report bugs consistentlyJohannes Schindelin1-8/+7
2016-07-25Merge branch 'jc/renormalize-merge-kill-safer-crlf'Junio C Hamano1-4/+13
2016-07-12merge: avoid "safer crlf" during recording of merge resultsJunio C Hamano1-4/+13
2016-06-28merge-recursive: convert merge_recursive_generic() to object_idbrian m. carlson1-7/+7
2016-06-28merge-recursive: convert leaf functions to use struct object_idbrian m. carlson1-118/+118
2016-06-28merge-recursive: convert struct merge_file_info to object_idbrian m. carlson1-19/+20
2016-06-28merge-recursive: convert struct stage_data to use object_idbrian m. carlson1-20/+18
2016-06-28diff: convert struct diff_filespec to struct object_idbrian m. carlson1-49/+58
2016-05-06Merge branch 'bc/object-id'Junio C Hamano1-2/+2
2016-04-19match-trees: convert shift_tree() and shift_tree_by() to use object_idbrian m. carlson1-2/+2
2016-04-12merge-recursive: do not check working copy when creating a virtual merge baseElijah Newren1-3/+3
2016-04-12merge-recursive: remove duplicate codeElijah Newren1-2/+0
2016-02-24merge-recursive: find-renames resets thresholdFelipe Gonçalves Assis1-1/+3
2016-02-17merge-recursive: more consistent interfaceFelipe Gonçalves Assis1-1/+4
2016-02-17merge-recursive: option to disable renamesFelipe Gonçalves Assis1-0/+7
2015-11-20Remove get_object_hash.brian m. carlson1-8/+8
2015-11-20Convert struct object to object_idbrian m. carlson1-7/+7
2015-11-20Add several uses of get_object_hash.brian m. carlson1-8/+8
2015-10-30Merge branch 'jk/delete-modechange-conflict'Junio C Hamano1-2/+6
2015-10-26merge: detect delete/modechange conflictJeff King1-2/+6
2015-10-05merge-recursive: convert malloc / strcpy to strbufJeff King1-9/+8
2015-05-20use file_exists() to check if a file exists in the worktreeRené Scharfe1-2/+1
2015-03-23merge-recursive: fix memleaksStefan Beller1-0/+3
2015-01-07Merge branch 'jc/merge-bases'Junio C Hamano1-1/+1
2014-12-01tree.c: update read_tree_recursive callback to pass strbuf as baseNguyễn Thái Ngọc Duy1-9/+6
2014-10-30get_merge_bases(): always clean-up object flagsJunio C Hamano1-1/+1
2014-10-14Merge branch 'mh/lockfile'Junio C Hamano1-0/+1
2014-10-14Merge branch 'da/include-compat-util-first-in-c'Junio C Hamano1-1/+1
2014-10-01lockfile.h: extract new header file for the functions in lockfile.cMichael Haggerty1-0/+1
2014-09-29Merge branch 'sb/merge-recursive-copy-paste-fix'Junio C Hamano1-5/+1
2014-09-23merge-recursive: remove stale commented debugging codeStefan Beller1-4/+0
2014-09-23merge-recursive: fix copy-paste mistakeStefan Beller1-1/+1
2014-09-19Merge branch 'rs/export-strbuf-addchars'Junio C Hamano1-3/+1
2014-09-15cleanups: ensure that git-compat-util.h is included firstDavid Aguilar1-1/+1
2014-09-08strbuf: use strbuf_addchars() for adding a char multiple timesRené Scharfe1-3/+1
2014-08-13merge-recursive.c: replace `git_config()` with `git_config_get_int()`Tanay Abhra1-16/+6
2014-07-23Merge branch 'ta/string-list-init'Junio C Hamano1-6/+3
2014-07-21replace memset with string-list initializersTanay Abhra1-6/+3
2014-07-16Merge branch 'rs/code-cleaning'Junio C Hamano1-1/+1
2014-07-16Merge branch 'nd/split-index'Junio C Hamano1-7/+4
2014-07-16Merge branch 'jk/commit-buffer-length' into maintJunio C Hamano1-2/+4
2014-07-10use strbuf_addch for adding single charactersRené Scharfe1-1/+1
2014-07-09Merge branch 'jk/xstrfmt'Junio C Hamano1-23/+30
2014-07-09Merge branch 'jk/skip-prefix'Junio C Hamano1-7/+8
2014-07-02Merge branch 'jk/commit-buffer-length'Junio C Hamano1-2/+4
2014-06-20use skip_prefix to avoid repeating stringsJeff King1-7/+8
2014-06-19unique_path: fix unlikely heap overflowJeff King1-15/+26
2014-06-19use xstrfmt to replace xmalloc + sprintfJeff King1-8/+4
2014-06-13commit: record buffer length in cacheJeff King1-1/+1
2014-06-13use get_commit_buffer everywhereJeff King1-1/+3
2014-06-13cache-tree: mark istate->cache_changed on cache tree updateNguyễn Thái Ngọc Duy1-3/+1
2014-06-13read-cache: new API write_locked_index instead of write_index/write_cacheNguyễn Thái Ngọc Duy1-4/+3
2014-06-12do not create "struct commit" with xcallocJeff King1-1/+1
2014-05-07merge-recursive.c: fix case-changing merge bugDavid Turner1-0/+6
2014-03-18Merge branch 'bk/refresh-missing-ok-in-merge-recursive' into maintJunio C Hamano1-1/+3
2014-02-27Merge branch 'bk/refresh-missing-ok-in-merge-recursive'Junio C Hamano1-1/+3
2014-02-24merge-recursive.c: tolerate missing files while refreshing indexBrad King1-1/+2
2014-02-24read-cache.c: extend make_cache_entry refresh flag with optionsBrad King1-1/+2
2014-01-27Merge branch 'mh/safe-create-leading-directories'Junio C Hamano1-1/+1
2014-01-06safe_create_leading_directories(): introduce enum for return valuesMichael Haggerty1-1/+1
2013-12-05replace {pre,suf}fixcmp() with {starts,ends}_with()Christian Couder1-3/+3
2013-10-28Merge branch 'jk/diff-algo' into maintJunio C Hamano1-2/+2
2013-10-14Merge branch 'jk/diff-algo'Jonathan Nieder1-2/+2
2013-09-26merge-recursive: fix parsing of "diff-algorithm" optionJohn Keeping1-2/+2
2013-09-09Merge branch 'jl/submodule-mv'Junio C Hamano1-1/+1
2013-07-15remove init_pathspec() in favor of parse_pathspec()Nguyễn Thái Ngọc Duy1-1/+1
2013-07-09Convert "struct cache_entry *" to "const ..." wherever possibleNguyễn Thái Ngọc Duy1-3/+4
2013-01-16diff: Introduce --diff-algorithm command line optionMichal Privoznik1-0/+9
2012-12-09Which merge_file() function do you mean?Junio C Hamano1-3/+3
2012-09-14Merge branch 'rj/path-cleanup'Junio C Hamano1-6/+7
2012-09-04Call mkpathdup() rather than xstrdup(mkpath(...))Ramsay Jones1-6/+7
2012-08-22Merge branch 'tr/void-diff-setup-done'Junio C Hamano1-2/+1
2012-08-22Merge branch 'tr/merge-recursive-flush'Junio C Hamano1-18/+1
2012-08-05merge-recursive: separate message for common ancestorsRalf Thielow1-1/+4
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-07-26i18n: merge-recursive: mark strings for translationJiang Xin1-69/+79
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
generated by cgit 1.2.3-korg (git 2.43.0) at 2025-12-07 01:33:37 +0000