path: root/merge-recursive.c
AgeCommit message (Expand)Author
2017-11-15merge-recursive: handle addition of submodule on our side of historyElijah Newren
2017-09-19Merge branch 'kw/merge-recursive-cleanup'Junio C Hamano
2017-09-08merge-recursive: change current file dir string_lists to hashmapKevin Willford
2017-09-06merge-recursive: remove return value from get_files_dirsKevin Willford
2017-09-06merge-recursive: fix memory leakKevin Willford
2017-08-23treewide: correct several "up-to-date" to "up to date"Martin Ågren
2017-07-07Merge branch 'sb/merge-recursive-code-cleanup'Junio C Hamano
2017-06-30merge-recursive: use DIFF_XDL_SET macroStefan Beller
2017-06-24Merge branch 'bw/config-h'Junio C Hamano
2017-06-24Merge branch 'bw/ls-files-sans-the-index'Junio C Hamano
2017-06-15config: don't include config.h by defaultBrandon Williams
2017-06-13convert: convert renormalize_buffer to take an indexBrandon Williams
2017-06-05diff-tree: convert diff_tree_sha1 to struct object_idBrandon Williams
2017-05-08object: convert parse_object* to take struct object_idbrian m. carlson
2017-05-08Convert lookup_tree to struct object_idbrian m. carlson
2017-05-08submodule: convert merge_submodule to use struct object_idbrian m. carlson
2017-05-02Convert struct cache_tree to use struct object_idbrian m. carlson
2017-02-27Merge branch 'mm/merge-rename-delete-message'Junio C Hamano
2017-01-30use SWAP macroRené Scharfe
2017-01-30merge-recursive: make "CONFLICT (rename/delete)" message show both pathsMatt McCutchen
2017-01-17Merge branch 'nd/qsort-in-merge-recursive' into maintJunio C Hamano
2017-01-17Merge branch 'jc/renormalize-merge-kill-safer-crlf' into maintJunio C Hamano
2016-12-19Merge branch 'jc/lock-report-on-error'Junio C Hamano
2016-12-19Merge branch 'jc/renormalize-merge-kill-safer-crlf'Junio C Hamano
2016-12-16Merge branch 'nd/qsort-in-merge-recursive'Junio C Hamano
2016-12-07hold_locked_index(): align error handling with hold_lockfile_for_update()Junio C Hamano
2016-11-28merge-recursive.c: use string_list_sort instead of qsortNguyễn Thái Ngọc Duy
2016-11-28merge-recursive: handle NULL in add_cacheinfo() correctlyJohannes Schindelin
2016-11-18submodules: allow empty working-tree dirs in merge/cherry-pickDavid Turner
2016-10-17Merge branch 'rs/cocci'Junio C Hamano
2016-10-10use strbuf_add_unique_abbrev() for adding short hashes, part 3René Scharfe
2016-09-26Merge branch 'rs/cocci'Junio C Hamano
2016-09-15use strbuf_addstr() for adding constant strings to a strbuf, part 2René Scharfe
2016-09-07Convert read_mmblob to take struct object_id.brian m. carlson
2016-09-07cache: convert struct cache_entry to use struct object_idbrian m. carlson
2016-08-19Merge branch 'rs/pull-signed-tag'Junio C Hamano
2016-08-14merge-recursive: fix verbose output for multiple base treesRené Scharfe
2016-08-12Merge branch 'rs/merge-recursive-string-list-init'Junio C Hamano
2016-08-05merge-recursive: use STRING_LIST_INIT_NODUPRené Scharfe
2016-08-01merge-recursive: flush output buffer even when erroring outJohannes Schindelin
2016-08-01merge_trees(): ensure that the callers release output bufferJohannes Schindelin
2016-08-01merge-recursive: offer an option to retain the output in 'obuf'Johannes Schindelin
2016-08-01merge-recursive: write the commit title in one goJohannes Schindelin
2016-08-01merge-recursive: flush output buffer before printing error messagesJohannes Schindelin
2016-07-26merge-recursive: switch to returning errors instead of dyingJohannes Schindelin
2016-07-26merge-recursive: handle return values indicating errorsJohannes Schindelin
2016-07-26merge-recursive: allow write_tree_from_memory() to error outJohannes Schindelin
2016-07-26merge-recursive: avoid returning a wholesale structJohannes Schindelin
2016-07-26merge_recursive: abort properly upon errorsJohannes Schindelin
2016-07-26merge-recursive: clarify code in was_tracked()Johannes Schindelin