Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Reorganize diff and add basic diff driver | Russell Belfer | 2013-06-10 | 1 | -0/+2 |
* | Make iterators use GIT_ITEROVER & smart advance | Russell Belfer | 2013-05-31 | 1 | -3/+12 |
* | merge setup | Edward Thomson | 2013-05-17 | 1 | -40/+555 |
* | Fix trailing whitespaces | nulltoken | 2013-05-15 | 1 | -164/+163 |
* | Merge pull request #1526 from arrbee/cleanup-error-return-without-msg | Vicent Martà | 2013-05-06 | 1 | -1/+2 |
|\ | |||||
| * | Set error when no merge base is found | Russell Belfer | 2013-05-01 | 1 | -1/+2 |
* | | puns are not funny; type punning especially so | Edward Thomson | 2013-05-02 | 1 | -6/+16 |
* | | merge: Warning noise | Vicent Marti | 2013-05-01 | 1 | -1/+1 |
* | | move NAME and REUC extensions to sys/ | Edward Thomson | 2013-04-30 | 1 | -0/+1 |
* | | renames! | Edward Thomson | 2013-04-30 | 1 | -1/+484 |
* | | merge! | Edward Thomson | 2013-04-30 | 1 | -3/+843 |
|/ | |||||
* | update copyrights | Edward Thomson | 2013-01-08 | 1 | -1/+1 |
* | merge cleanup should actually cleanup and the test should actually test | Edward Thomson | 2013-01-06 | 1 | -1/+1 |
* | MERGE_HEAD contents iterator | Edward Thomson | 2013-01-03 | 1 | -0/+53 |
* | expose merge metadata cleanup | Edward Thomson | 2013-01-03 | 1 | -1/+1 |
* | Fix function name and add real error check | Russell Belfer | 2012-11-29 | 1 | -4/+4 |
* | Rename git_count_ahead_behind -> git_graph_ahead_behind | Scott J. Goldman | 2012-11-28 | 1 | -82/+0 |
* | fix coding style: while( -> while ( | Scott J. Goldman | 2012-11-28 | 1 | -1/+1 |
* | Add initial implementation of ahead-behind count | Scott J. Goldman | 2012-11-28 | 1 | -0/+81 |
* | Move merge functions to merge.c | Ben Straub | 2012-11-27 | 1 | -0/+196 |
* | reset changes for merge | Edward Thomson | 2012-10-24 | 1 | -0/+48 |