summaryrefslogtreecommitdiff
path: root/merge-recursive.c
AgeCommit message (Expand)Author
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
2016-07-26die(_("BUG")): avoid translating bug messagesJohannes Schindelin
2016-07-26die("bug"): report bugs consistentlyJohannes Schindelin
2016-07-25Merge branch 'jc/renormalize-merge-kill-safer-crlf'Junio C Hamano
2016-07-12merge: avoid "safer crlf" during recording of merge resultsJunio C Hamano
2016-06-28merge-recursive: convert merge_recursive_generic() to object_idbrian m. carlson
2016-06-28merge-recursive: convert leaf functions to use struct object_idbrian m. carlson
2016-06-28merge-recursive: convert struct merge_file_info to object_idbrian m. carlson
2016-06-28merge-recursive: convert struct stage_data to use object_idbrian m. carlson
2016-06-28diff: convert struct diff_filespec to struct object_idbrian m. carlson
2016-05-06Merge branch 'bc/object-id'Junio C Hamano
2016-04-19match-trees: convert shift_tree() and shift_tree_by() to use object_idbrian m. carlson
2016-04-13merge-recursive: do not check working copy when creating a virtual merge baseElijah Newren
2016-04-13merge-recursive: remove duplicate codeElijah Newren
2016-02-24merge-recursive: find-renames resets thresholdFelipe Gonçalves Assis
2016-02-17merge-recursive: more consistent interfaceFelipe Gonçalves Assis
2016-02-17merge-recursive: option to disable renamesFelipe Gonçalves Assis
2015-11-20Remove get_object_hash.brian m. carlson
2015-11-20Convert struct object to object_idbrian m. carlson
2015-11-20Add several uses of get_object_hash.brian m. carlson
2015-10-30Merge branch 'jk/delete-modechange-conflict'Junio C Hamano
2015-10-26merge: detect delete/modechange conflictJeff King
2015-10-05merge-recursive: convert malloc / strcpy to strbufJeff King
2015-05-20use file_exists() to check if a file exists in the worktreeRené Scharfe
2015-03-23merge-recursive: fix memleaksStefan Beller
2015-01-07Merge branch 'jc/merge-bases'Junio C Hamano
2014-12-01tree.c: update read_tree_recursive callback to pass strbuf as baseNguyễn Thái Ngọc Duy
2014-10-30get_merge_bases(): always clean-up object flagsJunio C Hamano
2014-10-14Merge branch 'mh/lockfile'Junio C Hamano
2014-10-14Merge branch 'da/include-compat-util-first-in-c'Junio C Hamano