delta/gitano/libgit2.git/src/merge.h, branch replace-luagit2 git.gitano.org.uk: libgit2.git Introduce git_merge__extract_conflict_paths 2014-04-14T14:16:21+00:00 Jacques Germishuys jacquesg@striata.com 2014-04-07T18:15:45+00:00 399f2b6294963b8a7a154ffd0103484d018c4e27 






Remove `git_merge_result` as it's now unnecessary
2014-03-20T16:25:09+00:00

Edward Thomson
ethomson@microsoft.com

2014-03-12T16:43:53+00:00

d9fdee6e4cb87e4531d9ddba92b44e5323e794da












Update git_merge_tree_opts to git_merge_options
2014-03-20T16:25:08+00:00

Edward Thomson
ethomson@microsoft.com

2014-03-12T05:47:39+00:00

5aa2ac6de1622308884fd542f7b29e6810a0e98e












Remove fastforward / uptodate from `git_merge`
2014-03-20T16:25:06+00:00

Edward Thomson
ethomson@microsoft.com

2014-03-12T00:58:10+00:00

1c0b6a38bacb54de300d936338d4adb04a9b311f












Don't try to merge binary files
2014-01-20T22:15:12+00:00

Edward Thomson
ethomson@microsoft.com

2014-01-19T09:20:25+00:00

6b92c99bcbf32de131754a4f750278f84bf5b766












Introduce git_revert to revert a single commit
2013-12-02T22:57:41+00:00

Edward Thomson
ethomson@microsoft.com

2013-12-02T16:15:27+00:00

300d192f7ed45112121f2a35d5ca80a4913c7aad












merge branch into current, updating workdir
2013-11-05T15:00:39+00:00

Edward Thomson
ethomson@microsoft.com

2013-07-03T05:00:45+00:00

039db728f3a0477129e664f0fd8c08316a9e8b62












move mode_t to filebuf_open instead of _commit
2013-11-05T03:33:05+00:00

Edward Thomson
ethomson@microsoft.com

2013-11-04T23:28:57+00:00

1d3a8aeb4bd032d0bf34039fbcb308fba06b862a












merge setup
2013-05-17T13:26:24+00:00

Edward Thomson
ethomson@microsoft.com

2013-05-16T18:04:37+00:00

9c06b25054dd43802cbf6620c1082fa5d4498bf5












Fix trailing whitespaces
2013-05-15T20:41:30+00:00

nulltoken
emeric.fermas@gmail.com

2013-05-13T19:57:37+00:00

1fed6b07f0722c8b4349ff3709a49df3d3c9ae61