summaryrefslogtreecommitdiff
path: root/merge-recursive.c
AgeCommit message (Expand)Author
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
2014-10-01lockfile.h: extract new header file for the functions in lockfile.cMichael Haggerty
2014-09-30Merge branch 'sb/merge-recursive-copy-paste-fix'Junio C Hamano
2014-09-23merge-recursive: remove stale commented debugging codeStefan Beller
2014-09-23merge-recursive: fix copy-paste mistakeStefan Beller
2014-09-19Merge branch 'rs/export-strbuf-addchars'Junio C Hamano
2014-09-15cleanups: ensure that git-compat-util.h is included firstDavid Aguilar
2014-09-08strbuf: use strbuf_addchars() for adding a char multiple timesRené Scharfe
2014-08-13merge-recursive.c: replace `git_config()` with `git_config_get_int()`Tanay Abhra
2014-07-23Merge branch 'ta/string-list-init'Junio C Hamano
2014-07-21replace memset with string-list initializersTanay Abhra
2014-07-16Merge branch 'rs/code-cleaning'Junio C Hamano
2014-07-16Merge branch 'nd/split-index'Junio C Hamano
2014-07-16Merge branch 'jk/commit-buffer-length' into maintJunio C Hamano
2014-07-10use strbuf_addch for adding single charactersRené Scharfe
2014-07-09Merge branch 'jk/xstrfmt'Junio C Hamano
2014-07-09Merge branch 'jk/skip-prefix'Junio C Hamano
2014-07-02Merge branch 'jk/commit-buffer-length'Junio C Hamano
2014-06-20use skip_prefix to avoid repeating stringsJeff King
2014-06-19unique_path: fix unlikely heap overflowJeff King
2014-06-19use xstrfmt to replace xmalloc + sprintfJeff King
2014-06-13commit: record buffer length in cacheJeff King
2014-06-13use get_commit_buffer everywhereJeff King
2014-06-13cache-tree: mark istate->cache_changed on cache tree updateNguyễn Thái Ngọc Duy