delta/libgit2.git/tests/merge/workdir/analysis.c, branch example_general github.com: libgit2/libgit2.git s/git_merge_head/git_annotated_commit 2014-10-27T02:59:48+00:00 Edward Thomson ethomson@microsoft.com 2014-10-03T23:02:29+00:00 18b00406c6427eb8c9d96864448474e1d85017de Rename git_merge_head to git_annotated_commit, as it becomes used in more operations than just merge. 
Rename git_merge_head to git_annotated_commit, as it becomes used
in more operations than just merge.
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







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

Edward Thomson
ethomson@microsoft.com

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

58c2b1c4218a2f90ee2745687f2e17670bde0b1b












Introduce GIT_MERGE_ANALYSIS_UNBORN
2014-03-20T16:25:11+00:00

Edward Thomson
ethomson@microsoft.com

2014-03-18T23:04:51+00:00

ac584fcfd3e15b0a0200ee609bf964414936c710












git_merge_status -> git_merge_analysis
2014-03-20T16:25:10+00:00

Edward Thomson
ethomson@microsoft.com

2014-03-18T20:14:09+00:00

97f3462ae699fae370cfa410ed58eb869ae6b276