summaryrefslogtreecommitdiff
path: root/merge-recursive.c
AgeCommit message (Expand)AuthorFilesLines
2016-10-17Merge branch 'rs/cocci'Libravatar Junio C Hamano1-3/+3
2016-10-10use strbuf_add_unique_abbrev() for adding short hashes, part 3Libravatar René Scharfe1-3/+3
2016-09-26Merge branch 'rs/cocci'Libravatar Junio C Hamano1-1/+1
2016-09-15use strbuf_addstr() for adding constant strings to a strbuf, part 2Libravatar René Scharfe1-1/+1
2016-09-07Convert read_mmblob to take struct object_id.Libravatar brian m. carlson1-3/+3
2016-09-07cache: convert struct cache_entry to use struct object_idLibravatar brian m. carlson1-1/+1
2016-08-19Merge branch 'rs/pull-signed-tag'Libravatar Junio C Hamano1-4/+1
2016-08-13merge-recursive: fix verbose output for multiple base treesLibravatar René Scharfe1-4/+1
2016-08-12Merge branch 'rs/merge-recursive-string-list-init'Libravatar Junio C Hamano1-2/+1
2016-08-05merge-recursive: use STRING_LIST_INIT_NODUPLibravatar René Scharfe1-2/+1
2016-08-01merge-recursive: flush output buffer even when erroring outLibravatar Johannes Schindelin1-1/+3
2016-08-01merge_trees(): ensure that the callers release output bufferLibravatar Johannes Schindelin1-0/+2
2016-08-01merge-recursive: offer an option to retain the output in 'obuf'Libravatar Johannes Schindelin1-4/+13
2016-08-01merge-recursive: write the commit title in one goLibravatar Johannes Schindelin1-8/+9
2016-08-01merge-recursive: flush output buffer before printing error messagesLibravatar Johannes Schindelin1-48/+68
2016-07-26merge-recursive: switch to returning errors instead of dyingLibravatar Johannes Schindelin1-27/+35
2016-07-26merge-recursive: handle return values indicating errorsLibravatar Johannes Schindelin1-102/+150
2016-07-26merge-recursive: allow write_tree_from_memory() to error outLibravatar Johannes Schindelin1-2/+2
2016-07-26merge-recursive: avoid returning a wholesale structLibravatar Johannes Schindelin1-50/+56
2016-07-26merge_recursive: abort properly upon errorsLibravatar Johannes Schindelin1-5/+12
2016-07-26merge-recursive: clarify code in was_tracked()Libravatar Johannes Schindelin1-16/+14
2016-07-26die(_("BUG")): avoid translating bug messagesLibravatar Johannes Schindelin1-3/+3
2016-07-26die("bug"): report bugs consistentlyLibravatar Johannes Schindelin1-8/+7
2016-07-25Merge branch 'jc/renormalize-merge-kill-safer-crlf'Libravatar Junio C Hamano1-4/+13
2016-07-12merge: avoid "safer crlf" during recording of merge resultsLibravatar Junio C Hamano1-4/+13
2016-06-28merge-recursive: convert merge_recursive_generic() to object_idLibravatar brian m. carlson1-7/+7
2016-06-28merge-recursive: convert leaf functions to use struct object_idLibravatar brian m. carlson1-118/+118
2016-06-28merge-recursive: convert struct merge_file_info to object_idLibravatar brian m. carlson1-19/+20
2016-06-28merge-recursive: convert struct stage_data to use object_idLibravatar brian m. carlson1-20/+18
2016-06-28diff: convert struct diff_filespec to struct object_idLibravatar brian m. carlson1-49/+58
2016-05-06Merge branch 'bc/object-id'Libravatar Junio C Hamano1-2/+2
2016-04-19match-trees: convert shift_tree() and shift_tree_by() to use object_idLibravatar brian m. carlson1-2/+2
2016-04-12merge-recursive: do not check working copy when creating a virtual merge baseLibravatar Elijah Newren1-3/+3
2016-04-12merge-recursive: remove duplicate codeLibravatar Elijah Newren1-2/+0
2016-02-24merge-recursive: find-renames resets thresholdLibravatar Felipe Gonçalves Assis1-1/+3
2016-02-17merge-recursive: more consistent interfaceLibravatar Felipe Gonçalves Assis1-1/+4
2016-02-17merge-recursive: option to disable renamesLibravatar Felipe Gonçalves Assis1-0/+7
2015-11-20Remove get_object_hash.Libravatar brian m. carlson1-8/+8
2015-11-20Convert struct object to object_idLibravatar brian m. carlson1-7/+7
2015-11-20Add several uses of get_object_hash.Libravatar brian m. carlson1-8/+8
2015-10-30Merge branch 'jk/delete-modechange-conflict'Libravatar Junio C Hamano1-2/+6
2015-10-26merge: detect delete/modechange conflictLibravatar Jeff King1-2/+6
2015-10-05merge-recursive: convert malloc / strcpy to strbufLibravatar Jeff King1-9/+8
2015-05-20use file_exists() to check if a file exists in the worktreeLibravatar René Scharfe1-2/+1
2015-03-23merge-recursive: fix memleaksLibravatar Stefan Beller1-0/+3
2015-01-07Merge branch 'jc/merge-bases'Libravatar Junio C Hamano1-1/+1
2014-12-01tree.c: update read_tree_recursive callback to pass strbuf as baseLibravatar Nguyễn Thái Ngọc Duy1-9/+6
2014-10-30get_merge_bases(): always clean-up object flagsLibravatar Junio C Hamano1-1/+1
2014-10-14Merge branch 'mh/lockfile'Libravatar Junio C Hamano1-0/+1
2014-10-14Merge branch 'da/include-compat-util-first-in-c'Libravatar Junio C Hamano1-1/+1
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-12 06:20:06 +0000