summaryrefslogtreecommitdiff
path: root/include/git2/merge.h
Commit message (Collapse)AuthorAgeFilesLines
* Update documentation for API changesjamill/doc_updateJameson Miller2015-04-301-1/+2
|
* Added options to enable patience and minimal diff driversJacques Germishuys2015-03-161-0/+6
|
* Collapse whitespace flags into git_merge_file_flags_tJacques Germishuys2015-03-161-23/+11
|
* Renamed git_merge_options 'flags' to 'tree_flags'Jacques Germishuys2015-03-161-2/+2
|
* Allow for merges with whitespace discrepanciesJacques Germishuys2015-03-161-0/+23
|
* Better document `git_merge_commits`Edward Thomson2015-01-051-0/+8
| | | | | | | `git_merge_commits` (and thus `git_merge`) do not use the same strategy as `git-merge-recursive` wherein they can produce an artificial common ancestor that is the merge of all common ancestors. Document this accordingly.
* doc: add documentation to all the public structs and enumscmn/doc-allCarlos Martín Nieto2014-12-061-5/+20
| | | | | | | | | | This makes them show up in the reference, even if the text itself isn't the most descriptive. These have been found with grep -Przon '\n\ntypedef struct.*?\{' -- include grep -Przon '\n\ntypedef enum.*?\{' -- include
* merge: talk about the merging state after git_merge()Carlos Martín Nieto2014-11-021-0/+5
| | | | | Since it's not necessarily obvious, mention the merging state and how to clear it.
* s/git_merge_head/git_annotated_commitEdward Thomson2014-10-261-65/+3
| | | | | Rename git_merge_head to git_annotated_commit, as it becomes used in more operations than just merge.
* Add git_merge_bases_many.Arthur Schreiber2014-10-091-0/+15
|
* merge: expose multiple merge basescmn/oidarrayCarlos Martín Nieto2014-07-271-0/+16
| | | | | | | | We always calculate multiple merge bases, but up to now we had only exposed the "best" merge base. Introduce git_oidarray which analogously to git_strarray lets us return multiple ids.
* Modify GIT_MERGE_CONFIG -> GIT_MERGE_PREFERENCEEdward Thomson2014-05-271-6/+7
|
* Move GIT_MERGE_CONFIG_* to its own enumEdward Thomson2014-05-271-3/+11
|
* Introduce GIT_MERGE_CONFIG_* for merge.ff settingsEdward Thomson2014-05-271-0/+12
| | | | | | git_merge_analysis will now return GIT_MERGE_CONFIG_NO_FASTFORWARD when merge.ff=false and GIT_MERGE_CONFIG_FASTFORWARD_ONLY when merge.ff=true
* Fixed miscellaneous documentation errors.Michael Anderson2014-05-231-5/+5
|
* Doc fixesRussell Belfer2014-05-021-2/+2
|
* Make init_options fns use unsigned ints and macroRussell Belfer2014-05-021-3/+3
| | | | | Use an unsigned int for the version and add a helper macro so the code is simplified (and so the error message is a common string).
* Const correctness!Jacques Germishuys2014-04-031-1/+1
|
* Const up members of git_merge_file_resultEdward Thomson2014-03-311-2/+2
|
* Introduce git_merge_head_idEdward Thomson2014-03-311-0/+9
|
* UNBORN implies FAST_FORWARDEdward Thomson2014-03-201-2/+2
|
* Introduce GIT_MERGE_ANALYSIS_UNBORNEdward Thomson2014-03-201-0/+7
|
* git_merge_status -> git_merge_analysisEdward Thomson2014-03-201-10/+13
|
* Remove `git_merge_result` as it's now unnecessaryEdward Thomson2014-03-201-60/+4
|
* Update git_merge_tree_opts to git_merge_optionsEdward Thomson2014-03-201-13/+13
|
* Change signature of `git_merge` to take merge and checkout optsEdward Thomson2014-03-201-28/+4
|
* Remove fastforward / uptodate from `git_merge`Edward Thomson2014-03-201-27/+1
|
* Add `git_merge_status` to provide info about an upcoming mergeEdward Thomson2014-03-201-0/+40
|
* Introduce git_merge_file for consumersEdward Thomson2014-03-201-0/+169
|
* Implement git_merge_base_octopusAimeast2014-03-181-1/+16
|
* git_checkout_opts -> git_checkout_optionsBen Straub2014-03-061-2/+2
|
* Revert pull request #1997revert-1997Vicent Marti2014-03-061-1/+1
|
* Merge pull request #1997 from mgbowen/merge-options-init-fixVicent Marti2014-03-061-1/+1
|\ | | | | Fix GIT_MERGE_OPTS_INIT on MSVC.
| * Fix GIT_MERGE_OPTS_INIT on MSVC.Matthew Bowen2013-12-091-1/+1
| |
* | Added function-based initializers for every options struct.Matthew Bowen2014-03-051-0/+24
| | | | | | | | The basic structure of each function is courtesy of arrbee.
* | Improve documentation for mergingEdward Thomson2014-02-211-33/+127
| |
* | merge: rename _oid() -> id()Carlos Martín Nieto2014-01-251-4/+4
| | | | | | | | Following the rest of the series, use 'id' when refering to the value.
* | Support union mergesEdward Thomson2014-01-201-0/+3
| |
* | Remove the "merge none" flagEdward Thomson2014-01-201-5/+2
| | | | | | | | | | | | | | The "merge none" (don't automerge) flag was only to aide in merge trivial tests. We can easily determine whether merge trivial resulted in a trivial merge or an automerge by examining the REUC after automerge has completed.
* | merge_file should use more aggressive levelsEdward Thomson2014-01-201-7/+14
|/ | | | | | | | | | | The default merge_file level was XDL_MERGE_MINIMAL, which will produce conflicts where there should not be in the case where both sides were changed identically. Change the defaults to be more aggressive (XDL_MERGE_ZEALOUS) which will more aggressively compress non-conflicts. This matches git.git's defaults. Increase testing around reverting a previously reverted commit to illustrate this problem.
* Bare naked merge and rebaseEdward Thomson2013-12-031-0/+20
|
* merge branch into current, updating workdirEdward Thomson2013-11-051-0/+60
|
* merge: reverse array and length parameter orderCarlos Martín Nieto2013-09-221-3/+3
| | | | Make it pair up with the one for commits. This fixes #1691.
* fixes issues with objective-gitJohn Josef2013-09-081-5/+5
|
* Fixed most documentation header bugsAndreas Linde2013-06-241-1/+1
| | | | | | | | | | | Fixed a few header @param and @return typos with the help of -Wdocumentation in Xcode. The following warnings have not been fixed: common.h:213 - Not sure how the documentation format is for '...' notes.h:102 - Correct @param name but empty text notes.h:111 - Correct @param name but empty text pack.h:140 - @return missing text pack.h:148 - @return missing text
* Fix two typos in the merge docs.Arthur Schreiber2013-05-291-2/+2
|
* merge setupEdward Thomson2013-05-171-4/+55
|
* Fix trailing whitespacesnulltoken2013-05-151-4/+4
|
* Unify whitespaces to tabsLinquize2013-05-151-1/+1
|
* renames!Edward Thomson2013-04-301-0/+13
|
View Lorry Controller Status