Carlos Martín Nieto
7db0e6ee48
merge: expose multiple merge bases
...
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.
2014-07-27 17:17:22 +02:00
Edward Thomson
eff531e103
Modify GIT_MERGE_CONFIG -> GIT_MERGE_PREFERENCE
2014-05-27 20:58:20 -05:00
Edward Thomson
a3622ba6cc
Move GIT_MERGE_CONFIG_* to its own enum
2014-05-27 20:49:20 -05:00
Edward Thomson
d362093f9e
Introduce GIT_MERGE_CONFIG_* for merge.ff settings
...
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
2014-05-27 20:49:16 -05:00
Michael Anderson
31b0cb518f
Fixed miscellaneous documentation errors.
2014-05-23 15:57:20 +08:00
Russell Belfer
d2c16e9ac4
Doc fixes
2014-05-02 15:15:43 -07:00
Russell Belfer
702efc891f
Make init_options fns use unsigned ints and macro
...
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).
2014-05-02 09:21:33 -07:00
Jacques Germishuys
3b4ba27870
Const correctness!
2014-04-03 16:06:31 +02:00
Edward Thomson
7f930ded88
Const up members of git_merge_file_result
2014-03-31 11:08:31 -07:00
Edward Thomson
976634c467
Introduce git_merge_head_id
2014-03-31 11:43:38 -05:00
Edward Thomson
58c2b1c421
UNBORN implies FAST_FORWARD
2014-03-20 09:35:22 -07:00
Edward Thomson
ac584fcfd3
Introduce GIT_MERGE_ANALYSIS_UNBORN
2014-03-20 09:25:11 -07:00
Edward Thomson
97f3462ae6
git_merge_status -> git_merge_analysis
2014-03-20 09:25:10 -07:00
Edward Thomson
d9fdee6e4c
Remove git_merge_result as it's now unnecessary
2014-03-20 09:25:09 -07:00
Edward Thomson
5aa2ac6de1
Update git_merge_tree_opts to git_merge_options
2014-03-20 09:25:08 -07:00
Edward Thomson
02105a27f0
Change signature of git_merge to take merge and checkout opts
2014-03-20 09:25:07 -07:00
Edward Thomson
1c0b6a38ba
Remove fastforward / uptodate from git_merge
2014-03-20 09:25:06 -07:00
Edward Thomson
ccb308273a
Add git_merge_status to provide info about an upcoming merge
2014-03-20 09:25:06 -07:00
Edward Thomson
05d47768ca
Introduce git_merge_file for consumers
2014-03-20 09:25:05 -07:00
Aimeast
0aee025bef
Implement git_merge_base_octopus
2014-03-18 22:31:14 +08:00
Ben Straub
6affd71f33
git_checkout_opts -> git_checkout_options
2014-03-06 09:44:51 -08:00
Vicent Marti
2ab6d2cd47
Revert pull request #1997
2014-03-06 16:08:17 +01:00
Vicent Marti
4d116c3413
Merge pull request #1997 from mgbowen/merge-options-init-fix
...
Fix GIT_MERGE_OPTS_INIT on MSVC.
2014-03-06 16:08:12 +01:00
Matthew Bowen
b9f819978c
Added function-based initializers for every options struct.
...
The basic structure of each function is courtesy of arrbee.
2014-03-05 21:49:23 -05:00
Edward Thomson
c254e2b641
Improve documentation for merging
2014-02-21 09:28:15 -08:00
Carlos Martín Nieto
a1bbc0ce20
merge: rename _oid() -> id()
...
Following the rest of the series, use 'id' when refering to the value.
2014-01-25 08:15:44 +01:00
Edward Thomson
db3462ce77
Support union merges
2014-01-20 17:15:15 -05:00
Edward Thomson
0e1ba46cfb
Remove the "merge none" flag
...
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.
2014-01-20 17:15:14 -05:00
Edward Thomson
c1d648c5c6
merge_file should use more aggressive levels
...
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.
2014-01-20 17:15:11 -05:00
Matthew Bowen
0db9322547
Fix GIT_MERGE_OPTS_INIT on MSVC.
2013-12-09 10:44:26 -05:00
Edward Thomson
eac938d96e
Bare naked merge and rebase
2013-12-03 10:18:53 -05:00
Edward Thomson
039db728f3
merge branch into current, updating workdir
2013-11-05 10:00:39 -05:00
Carlos Martín Nieto
07fb67f90e
merge: reverse array and length parameter order
...
Make it pair up with the one for commits. This fixes #1691 .
2013-09-22 05:59:35 +02:00
John Josef
917e5fa9a1
fixes issues with objective-git
2013-09-08 18:31:56 -04:00
Andreas Linde
e196716457
Fixed most documentation header bugs
...
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
2013-06-24 15:33:41 +02:00
Arthur Schreiber
31a6118175
Fix two typos in the merge docs.
2013-05-29 00:02:26 +03:00
Edward Thomson
9c06b25054
merge setup
2013-05-17 08:26:24 -05:00
nulltoken
1fed6b07f0
Fix trailing whitespaces
2013-05-15 22:41:30 +02:00
Linquize
0cb16fe924
Unify whitespaces to tabs
2013-05-15 20:26:55 +08:00
Edward Thomson
0462fba538
renames!
2013-04-30 16:01:11 -05:00
Edward Thomson
bec65a5e99
merge!
2013-04-30 15:31:31 -05:00
Edward Thomson
359fc2d241
update copyrights
2013-01-08 17:31:27 -06:00
Ben Straub
eac7695683
Format/documentation tweaks for merge.h
2012-11-27 13:18:29 -08:00
Sascha Cunz
857323d4db
git_mergebase: Constness-Fix for consistency
2012-09-09 15:53:57 +02:00
nulltoken
b46bdb2204
merge: Expose git_merge_base_many()
2012-06-07 16:25:37 +02:00
Carlos Martín Nieto
bf787bd87c
Move git_merge_base() to is own header and document it
2012-04-12 20:25:25 +02:00
