summaryrefslogtreecommitdiff
path: root/merge-recursive.c
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | merge-recursive: make a helper function for cleanup for handle_renamesElijah Newren2018-02-141-10/+13
| * | merge-recursive: split out code for determining diff_filepairsElijah Newren2018-02-141-22/+62
| * | merge-recursive: make !o->detect_rename codepath more obviousElijah Newren2018-02-141-2/+9
| * | merge-recursive: fix leaks of allocated renames and diff_filepairsElijah Newren2018-02-141-5/+15
| * | merge-recursive: introduce new functions to handle rename logicElijah Newren2018-02-141-10/+33
| * | merge-recursive: move the get_renames() functionElijah Newren2018-02-141-69/+70
* | | Merge branch 'rj/warning-uninitialized-fix'Junio C Hamano2018-03-211-1/+1
|\ \ \
| * | | -Wuninitialized: remove some 'init-self' workaroundsRamsay Jones2018-03-201-1/+1
| * | | Merge branch 'jc/merge-symlink-ours-theirs' into maintJunio C Hamano2018-02-151-4/+13
| |\ \ \
* | | | | write_locked_index(): add flag to avoid writing unchanged indexma/skip-writing-unchanged-indexMartin Ågren2018-03-011-3/+2
* | | | | merge-recursive: always roll back lock in `merge_recursive_generic()`Martin Ågren2018-02-281-1/+4
| |_|_|/ |/| | |
* | | | Merge branch 'po/object-id'Junio C Hamano2018-02-151-2/+3
|\ \ \ \
| * | | | sha1_file: convert write_sha1_file to object_idPatryk Obara2018-01-301-2/+3
* | | | | Merge branch 'en/merge-recursive-fixes'Junio C Hamano2018-02-151-1/+20
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| |
| * | | merge-recursive: add explanation for src_entry and dst_entryen/merge-recursive-fixesElijah Newren2018-01-191-0/+19
| * | | merge-recursive: fix logic ordering issueElijah Newren2018-01-191-1/+1
| |/ /
* | | Merge branch 'jc/merge-symlink-ours-theirs'Junio C Hamano2018-01-231-4/+13
|\ \ \ | |/ / |/| / | |/
| * merge: teach -Xours/-Xtheirs to symbolic link mergejc/merge-symlink-ours-theirsJunio C Hamano2018-01-031-4/+13
* | Merge branch 'ew/empty-merge-with-dirty-index-maint' into ew/empty-merge-with...ew/empty-merge-with-dirty-indexJunio C Hamano2018-01-091-1/+1
|\ \
| * | merge-recursive: do not look at the index during recursive mergeew/empty-merge-with-dirty-index-maintJunio C Hamano2018-01-091-1/+1
* | | Merge branch 'ew/empty-merge-with-dirty-index-maint' into ew/empty-merge-with...Junio C Hamano2017-12-221-0/+7
|\ \ \ | |/ /
| * | merge-recursive: avoid incorporating uncommitted changes in a mergeElijah Newren2017-12-221-0/+7
* | | Merge branch 'en/merge-recursive-icase-removal'Junio C Hamano2017-12-191-1/+1
|\ \ \
| * | | merge-recursive: ignore_case shouldn't reject intentional removalsen/merge-recursive-icase-removalElijah Newren2017-11-271-1/+1
* | | | Merge branch 'bc/hash-algo'Junio C Hamano2017-12-131-1/+1
|\ \ \ \
| * | | | Switch empty tree and blob lookups to use hash abstractionbrian m. carlson2017-11-131-1/+1
* | | | | Merge branch 'sb/test-cherry-pick-submodule-getting-in-a-way'Junio C Hamano2017-11-271-2/+3
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | merge-recursive: handle addition of submodule on our side of historysb/test-cherry-pick-submodule-getting-in-a-wayElijah Newren2017-11-151-2/+3
| | |/ / | |/| |
* | | | Merge branch 'jc/ignore-cr-at-eol'Junio C Hamano2017-11-271-0/+2
|\ \ \ \
| * | | | diff: --ignore-cr-at-eoljc/ignore-cr-at-eolJunio C Hamano2017-11-081-0/+2
* | | | | Merge branch 'ao/merge-verbosity-getenv-just-once'Junio C Hamano2017-11-151-3/+4
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | merge-recursive: check GIT_MERGE_VERBOSITY only onceao/merge-verbosity-getenv-just-onceAndrey Okoshkin2017-11-011-3/+4
| |/ / /
View Lorry Controller Status