summaryrefslogtreecommitdiff
path: root/examples/merge.c
Commit message (Expand)AuthorAgeFilesLines
* examples: normalize decls and usage of options structsEtienne Samson2019-11-061-8/+8
* global: DRY includes of assert.hEtienne Samson2019-11-061-1/+0
* Merge pull request #5143 from libgit2/ethomson/warningsPatrick Steinhardt2019-07-051-2/+2
|\
| * examples: cast away constness for reallocating head arraysPatrick Steinhardt2019-07-051-1/+1
| * examples: cast away const-nessEdward Thomson2019-06-251-2/+2
* | Resolve static check warnings in example codeScott Furry2019-06-271-0/+1
|/
* examples: move MSVC compatibility macros into common headerPatrick Steinhardt2019-04-161-4/+0
* examples: create common lg2 executablePatrick Steinhardt2019-02-151-9/+1
* errors: remove giterr usage in examplesEdward Thomson2019-01-221-2/+2
* object_type: convert final internal users to new namesethomson/git_objEdward Thomson2019-01-171-2/+2
* examples: move refish resolution function in commonEtienne Samson2018-07-071-23/+0
* examples: zero out our options memory before useEtienne Samson2018-01-251-0/+2
* examples: our/their can be NULLEtienne Samson2018-01-251-2/+4
* examples: fix remaining review commentsEtienne Samson2018-01-251-0/+2
* examples: move support code into static functionsEtienne Samson2018-01-251-81/+97
* examples: hoist the merge analysis back into mainEtienne Samson2018-01-251-58/+39
* examples: minor review fixupsEtienne Samson2018-01-251-10/+12
* examples: add mergeEtienne Samson2018-01-251-0/+391
View Lorry Controller Status