delta/libgit2.git/include/git2/merge.h, branch cmn/treebuilder-insert-sorted github.com: libgit2/libgit2.git Modify GIT_MERGE_CONFIG -> GIT_MERGE_PREFERENCE 2014-05-28T01:58:20+00:00 Edward Thomson ethomson@microsoft.com 2014-05-28T01:58:20+00:00 eff531e1034401b144b02ff2913a361669d04129 






Move GIT_MERGE_CONFIG_* to its own enum
2014-05-28T01:49:20+00:00

Edward Thomson
ethomson@microsoft.com

2014-05-16T18:54:40+00:00

a3622ba6cc0970abe485baa98ab53e32df28cfdc












Introduce GIT_MERGE_CONFIG_* for merge.ff settings
2014-05-28T01:49:16+00:00

Edward Thomson
ethomson@microsoft.com

2014-05-08T22:41:36+00:00

d362093f9e858cf48d3c09bbcacf01f057b58db1

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





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.
2014-05-23T07:57:20+00:00

Michael Anderson
drmikeando@gmail.com

2014-05-22T09:16:21+00:00

31b0cb518f11d4ec8a95df54d077d51b05fa899c












Doc fixes
2014-05-02T22:15:43+00:00

Russell Belfer
rb@github.com

2014-05-02T22:15:43+00:00

d2c16e9ac4921e94eb5db972e6b8452d71a623fc












Make init_options fns use unsigned ints and macro
2014-05-02T16:21:33+00:00

Russell Belfer
rb@github.com

2014-04-30T17:57:42+00:00

702efc891f2a620f10998062ba0c00b34100f632

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).





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!
2014-04-03T14:06:31+00:00

Jacques Germishuys
jacquesg@striata.com

2014-04-03T13:50:21+00:00

3b4ba2787049c561cd7a9e3fea8fc16e473a0b32












Const up members of git_merge_file_result
2014-03-31T18:08:31+00:00

Edward Thomson
ethomson@microsoft.com

2014-03-31T16:38:06+00:00

7f930ded88b2adda94423a618e268700494dc5c0












Introduce git_merge_head_id
2014-03-31T16:43:38+00:00

Edward Thomson
ethomson@microsoft.com

2014-03-31T02:56:18+00:00

976634c4672f3e1144b8f11c6c984157a28f5d98












UNBORN implies FAST_FORWARD
2014-03-20T16:35:22+00:00

Edward Thomson
ethomson@microsoft.com

2014-03-20T16:35:22+00:00

58c2b1c4218a2f90ee2745687f2e17670bde0b1b