summaryrefslogtreecommitdiff
path: root/merge-recursive.c
Commit message (Expand)AuthorAgeFilesLines
* 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
| |/ / /
* | | | Merge branch 'bw/diff-opt-impl-to-bitfields'Junio C Hamano2017-11-091-2/+2
|\ \ \ \
| * | | | diff: make struct diff_flags members lowercasebw/diff-opt-impl-to-bitfieldsBrandon Williams2017-11-011-2/+2
| * | | | diff: remove DIFF_OPT_CLR macroBrandon Williams2017-11-011-1/+1
| * | | | diff: remove DIFF_OPT_SET macroBrandon Williams2017-11-011-1/+1
| | |/ / | |/| |
* | | | treewide: prefer lockfiles on the stackMartin Ågren2017-10-061-3/+3
|/ / /
* | | Merge branch 'kw/merge-recursive-cleanup'Junio C Hamano2017-09-191-20/+56
|\ \ \
| * | | merge-recursive: change current file dir string_lists to hashmapkw/merge-recursive-cleanupKevin Willford2017-09-081-11/+45
| * | | merge-recursive: remove return value from get_files_dirsKevin Willford2017-09-061-6/+2
| * | | merge-recursive: fix memory leakKevin Willford2017-09-061-3/+9
| | |/ | |/|
* | | treewide: correct several "up-to-date" to "up to date"ma/up-to-dateMartin Ågren2017-08-231-1/+1
|/ /
* | Merge branch 'sb/merge-recursive-code-cleanup'Junio C Hamano2017-07-061-3/+3
|\ \ | |/
| * merge-recursive: use DIFF_XDL_SET macrosb/merge-recursive-code-cleanupStefan Beller2017-06-301-3/+3
* | Merge branch 'bw/config-h'Junio C Hamano2017-06-241-0/+1
|\ \
| * | config: don't include config.h by defaultBrandon Williams2017-06-151-0/+1
| |/
* | Merge branch 'bw/ls-files-sans-the-index'Junio C Hamano2017-06-241-2/+2
|\ \
| * | convert: convert renormalize_buffer to take an indexBrandon Williams2017-06-131-2/+2
* | | diff-tree: convert diff_tree_sha1 to struct object_idBrandon Williams2017-06-051-1/+1
|/ /
* | object: convert parse_object* to take struct object_idbrian m. carlson2017-05-081-1/+1
* | Convert lookup_tree to struct object_idbrian m. carlson2017-05-081-3/+3
* | submodule: convert merge_submodule to use struct object_idbrian m. carlson2017-05-081-4/+4
* | Convert struct cache_tree to use struct object_idbrian m. carlson2017-05-021-1/+1
|/
* Merge branch 'mm/merge-rename-delete-message'Junio C Hamano2017-02-271-54/+63
|\
| * merge-recursive: make "CONFLICT (rename/delete)" message show both pathsmm/merge-rename-delete-messageMatt McCutchen2017-01-301-54/+63
| * Merge branch 'nd/qsort-in-merge-recursive' into maintJunio C Hamano2017-01-171-9/+7
| |\
| * \ Merge branch 'jc/renormalize-merge-kill-safer-crlf' into maintJunio C Hamano2017-01-171-0/+2
| |\ \
* | | | use SWAP macroRené Scharfe2017-01-301-4/+1
* | | | Merge branch 'jc/lock-report-on-error'Junio C Hamano2016-12-191-1/+1
|\ \ \ \
| * | | | hold_locked_index(): align error handling with hold_lockfile_for_update()Junio C Hamano2016-12-071-1/+1
* | | | | Merge branch 'jc/renormalize-merge-kill-safer-crlf'Junio C Hamano2016-12-191-0/+2
|\ \ \ \ \ | | |_|/ / | |/| | |
View Lorry Controller Status