summaryrefslogtreecommitdiff
path: root/merge-recursive.c
AgeCommit message (Expand)AuthorFilesLines
2018-02-15Merge branch 'jc/merge-symlink-ours-theirs' into maintLibravatar Junio C Hamano1-4/+13
2018-01-09Merge branch 'ew/empty-merge-with-dirty-index-maint' into ew/empty-merge-with...Libravatar Junio C Hamano1-1/+1
2018-01-09merge-recursive: do not look at the index during recursive mergeLibravatar Junio C Hamano1-1/+1
2018-01-03merge: teach -Xours/-Xtheirs to symbolic link mergeLibravatar Junio C Hamano1-4/+13
2017-12-22Merge branch 'ew/empty-merge-with-dirty-index-maint' into ew/empty-merge-with...Libravatar Junio C Hamano1-0/+7
2017-12-22merge-recursive: avoid incorporating uncommitted changes in a mergeLibravatar Elijah Newren1-0/+7
2017-12-19Merge branch 'en/merge-recursive-icase-removal'Libravatar Junio C Hamano1-1/+1
2017-12-13Merge branch 'bc/hash-algo'Libravatar Junio C Hamano1-1/+1
2017-11-27Merge branch 'sb/test-cherry-pick-submodule-getting-in-a-way'Libravatar Junio C Hamano1-2/+3
2017-11-27Merge branch 'jc/ignore-cr-at-eol'Libravatar Junio C Hamano1-0/+2
2017-11-27merge-recursive: ignore_case shouldn't reject intentional removalsLibravatar Elijah Newren1-1/+1
2017-11-15merge-recursive: handle addition of submodule on our side of historyLibravatar Elijah Newren1-2/+3
2017-11-15Merge branch 'ao/merge-verbosity-getenv-just-once'Libravatar Junio C Hamano1-3/+4
2017-11-13Switch empty tree and blob lookups to use hash abstractionLibravatar brian m. carlson1-1/+1
2017-11-09Merge branch 'bw/diff-opt-impl-to-bitfields'Libravatar Junio C Hamano1-2/+2
2017-11-08diff: --ignore-cr-at-eolLibravatar Junio C Hamano1-0/+2
2017-11-01diff: make struct diff_flags members lowercaseLibravatar Brandon Williams1-2/+2
2017-11-01diff: remove DIFF_OPT_CLR macroLibravatar Brandon Williams1-1/+1
2017-11-01diff: remove DIFF_OPT_SET macroLibravatar Brandon Williams1-1/+1
2017-11-01merge-recursive: check GIT_MERGE_VERBOSITY only onceLibravatar Andrey Okoshkin1-3/+4
2017-10-06treewide: prefer lockfiles on the stackLibravatar Martin Ågren1-3/+3
2017-09-19Merge branch 'kw/merge-recursive-cleanup'Libravatar Junio C Hamano1-20/+56
2017-09-08merge-recursive: change current file dir string_lists to hashmapLibravatar Kevin Willford1-11/+45
2017-09-06merge-recursive: remove return value from get_files_dirsLibravatar Kevin Willford1-6/+2
2017-09-06merge-recursive: fix memory leakLibravatar Kevin Willford1-3/+9
2017-08-23treewide: correct several "up-to-date" to "up to date"Libravatar Martin Ågren1-1/+1
2017-07-06Merge branch 'sb/merge-recursive-code-cleanup'Libravatar Junio C Hamano1-3/+3
2017-06-30merge-recursive: use DIFF_XDL_SET macroLibravatar Stefan Beller1-3/+3
2017-06-24Merge branch 'bw/config-h'Libravatar Junio C Hamano1-0/+1
2017-06-24Merge branch 'bw/ls-files-sans-the-index'Libravatar Junio C Hamano1-2/+2
2017-06-15config: don't include config.h by defaultLibravatar Brandon Williams1-0/+1
2017-06-13convert: convert renormalize_buffer to take an indexLibravatar Brandon Williams1-2/+2
2017-06-05diff-tree: convert diff_tree_sha1 to struct object_idLibravatar Brandon Williams1-1/+1
2017-05-08object: convert parse_object* to take struct object_idLibravatar brian m. carlson1-1/+1
2017-05-08Convert lookup_tree to struct object_idLibravatar brian m. carlson1-3/+3
2017-05-08submodule: convert merge_submodule to use struct object_idLibravatar brian m. carlson1-4/+4
2017-05-02Convert struct cache_tree to use struct object_idLibravatar brian m. carlson1-1/+1
2017-02-27Merge branch 'mm/merge-rename-delete-message'Libravatar Junio C Hamano1-54/+63
2017-01-30use SWAP macroLibravatar René Scharfe1-4/+1
2017-01-30merge-recursive: make "CONFLICT (rename/delete)" message show both pathsLibravatar Matt McCutchen1-54/+63
2017-01-17Merge branch 'nd/qsort-in-merge-recursive' into maintLibravatar Junio C Hamano1-9/+7
2017-01-17Merge branch 'jc/renormalize-merge-kill-safer-crlf' into maintLibravatar Junio C Hamano1-0/+2
2016-12-19Merge branch 'jc/lock-report-on-error'Libravatar Junio C Hamano1-1/+1
2016-12-19Merge branch 'jc/renormalize-merge-kill-safer-crlf'Libravatar Junio C Hamano1-0/+2
2016-12-16Merge branch 'nd/qsort-in-merge-recursive'Libravatar Junio C Hamano1-9/+7
2016-12-07hold_locked_index(): align error handling with hold_lockfile_for_update()Libravatar Junio C Hamano1-1/+1
2016-11-28merge-recursive.c: use string_list_sort instead of qsortLibravatar Nguyễn Thái Ngọc Duy1-9/+7
2016-11-28merge-recursive: handle NULL in add_cacheinfo() correctlyLibravatar Johannes Schindelin1-0/+2
2016-11-17submodules: allow empty working-tree dirs in merge/cherry-pickLibravatar David Turner1-6/+15
2016-10-17Merge branch 'rs/cocci'Libravatar Junio C Hamano1-3/+3
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-12 11:46:56 +0000