summaryrefslogtreecommitdiff
path: root/merge-recursive.c
Commit message (Expand)AuthorAgeFilesLines
* config: don't include config.h by defaultBrandon Williams2017-06-151-0/+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
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | merge-recursive: handle NULL in add_cacheinfo() correctlyJohannes Schindelin2016-11-281-0/+2
* | | | | Merge branch 'nd/qsort-in-merge-recursive'Junio C Hamano2016-12-161-9/+7
|\ \ \ \ \ | |_|_|/ / |/| | | / | | |_|/ | |/| |
| * | | merge-recursive.c: use string_list_sort instead of qsortnd/qsort-in-merge-recursiveNguyễn Thái Ngọc Duy2016-11-281-9/+7
* | | | submodules: allow empty working-tree dirs in merge/cherry-pickdt/empty-submodule-in-mergeDavid Turner2016-11-171-6/+15
| |_|/ |/| |
* | | Merge branch 'rs/cocci'Junio C Hamano2016-10-171-3/+3
|\ \ \ | |/ /
| * | use strbuf_add_unique_abbrev() for adding short hashes, part 3René Scharfe2016-10-101-3/+3
* | | Merge branch 'rs/cocci'Junio C Hamano2016-09-261-1/+1
|\ \ \ | |/ /
| * | use strbuf_addstr() for adding constant strings to a strbuf, part 2René Scharfe2016-09-151-1/+1
* | | Convert read_mmblob to take struct object_id.brian m. carlson2016-09-071-3/+3
* | | cache: convert struct cache_entry to use struct object_idbrian m. carlson2016-09-071-1/+1
|/ /
* | Merge branch 'rs/pull-signed-tag'Junio C Hamano2016-08-191-4/+1
|\ \
| * | merge-recursive: fix verbose output for multiple base treesRené Scharfe2016-08-131-4/+1
* | | Merge branch 'rs/merge-recursive-string-list-init'Junio C Hamano2016-08-121-2/+1
|\ \ \
| * | | merge-recursive: use STRING_LIST_INIT_NODUPrs/merge-recursive-string-list-initRené Scharfe2016-08-051-2/+1
| |/ /
* | | merge-recursive: flush output buffer even when erroring outjs/am-3-merge-recursive-directJohannes Schindelin2016-08-011-1/+3
* | | merge_trees(): ensure that the callers release output bufferJohannes Schindelin2016-08-011-0/+2
* | | merge-recursive: offer an option to retain the output in 'obuf'Johannes Schindelin2016-08-011-4/+13
* | | merge-recursive: write the commit title in one goJohannes Schindelin2016-08-011-8/+9
* | | merge-recursive: flush output buffer before printing error messagesJohannes Schindelin2016-08-011-48/+68
* | | merge-recursive: switch to returning errors instead of dyingJohannes Schindelin2016-07-261-27/+35
* | | merge-recursive: handle return values indicating errorsJohannes Schindelin2016-07-261-102/+150
* | | merge-recursive: allow write_tree_from_memory() to error outJohannes Schindelin2016-07-261-2/+2
* | | merge-recursive: avoid returning a wholesale structJohannes Schindelin2016-07-261-50/+56
* | | merge_recursive: abort properly upon errorsJohannes Schindelin2016-07-261-5/+12
* | | merge-recursive: clarify code in was_tracked()Johannes Schindelin2016-07-261-16/+14
* | | die(_("BUG")): avoid translating bug messagesJohannes Schindelin2016-07-261-3/+3
* | | die("bug"): report bugs consistentlyJohannes Schindelin2016-07-261-8/+7
* | | Merge branch 'jc/renormalize-merge-kill-safer-crlf'Junio C Hamano2016-07-251-4/+13
|\ \ \ | | |/ | |/|
| * | merge: avoid "safer crlf" during recording of merge resultsJunio C Hamano2016-07-121-4/+13
* | | merge-recursive: convert merge_recursive_generic() to object_idbrian m. carlson2016-06-281-7/+7
* | | merge-recursive: convert leaf functions to use struct object_idbrian m. carlson2016-06-281-118/+118
* | | merge-recursive: convert struct merge_file_info to object_idbrian m. carlson2016-06-281-19/+20
* | | merge-recursive: convert struct stage_data to use object_idbrian m. carlson2016-06-281-20/+18
* | | diff: convert struct diff_filespec to struct object_idbrian m. carlson2016-06-281-49/+58
| |/ |/|
* | Merge branch 'bc/object-id'Junio C Hamano2016-05-061-2/+2
|\ \
| * | match-trees: convert shift_tree() and shift_tree_by() to use object_idbrian m. carlson2016-04-191-2/+2
| |/
* | merge-recursive: do not check working copy when creating a virtual merge baseen/merge-fixesElijah Newren2016-04-121-3/+3
* | merge-recursive: remove duplicate codeElijah Newren2016-04-121-2/+0
|/
* merge-recursive: find-renames resets thresholdFelipe Gonçalves Assis2016-02-241-1/+3
* merge-recursive: more consistent interfaceFelipe Gonçalves Assis2016-02-171-1/+4
* merge-recursive: option to disable renamesFelipe Gonçalves Assis2016-02-171-0/+7
View Lorry Controller Status