summaryrefslogtreecommitdiff
path: root/src/merge.h
Commit message (Expand)AuthorAgeFilesLines
* Make sure to always include "common.h" firstPatrick Steinhardt2017-07-031-0/+2
* merge driver: remove `check` callbackEdward Thomson2016-03-171-6/+0
* merge driver: correct global initializationEdward Thomson2016-03-171-31/+0
* merge driver: allow custom default driverEdward Thomson2016-03-171-0/+1
* merge driver: introduce custom merge driversEdward Thomson2016-03-171-2/+97
* merge: rename `git_merge_tree_flags_t` -> `git_merge_flags_t`Edward Thomson2015-11-251-2/+2
* merge: merge iteratorsEdward Thomson2015-05-111-4/+14
* PERF: In MERGE, lazily compute is_binaryJeff Hostetler2015-03-161-1/+0
* s/git_merge_head/git_annotated_commitEdward Thomson2014-10-261-12/+2
* git_checkout_index: checkout other indexesEdward Thomson2014-07-011-1/+1
* Introduce git_merge__extract_conflict_pathsJacques Germishuys2014-04-141-0/+2
* Remove `git_merge_result` as it's now unnecessaryEdward Thomson2014-03-201-10/+0
* Update git_merge_tree_opts to git_merge_optionsEdward Thomson2014-03-201-1/+1
* Remove fastforward / uptodate from `git_merge`Edward Thomson2014-03-201-3/+2
* Don't try to merge binary filesEdward Thomson2014-01-201-0/+2
* Introduce git_revert to revert a single commitEdward Thomson2013-12-021-0/+2
* merge branch into current, updating workdirEdward Thomson2013-11-051-0/+11
* move mode_t to filebuf_open instead of _commitEdward Thomson2013-11-041-0/+1
* merge setupEdward Thomson2013-05-171-0/+22
* Fix trailing whitespacesnulltoken2013-05-151-18/+18
* Unify whitespaces to tabsLinquize2013-05-151-14/+14
* merge!Edward Thomson2013-04-301-5/+110
* update copyrightsEdward Thomson2013-01-081-1/+1
* MERGE_HEAD contents iteratorEdward Thomson2013-01-031-0/+1
* expose merge metadata cleanupEdward Thomson2013-01-031-1/+0
* Move merge functions to merge.cBen Straub2012-11-271-0/+3
* reset changes for mergeEdward Thomson2012-10-241-0/+19