Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Capture conflict information in MERGE_MSG for revert and merge | Jacques Germishuys | 2014-04-14 | 1 | -0/+1 |
* | Update git_merge_tree_opts to git_merge_options | Edward Thomson | 2014-03-20 | 1 | -3/+3 |
* | git_revert_opts -> git_revert_optionsoptions-names | Ben Straub | 2014-03-06 | 1 | -12/+12 |
* | Added function-based initializers for every options struct. | Matthew Bowen | 2014-03-05 | 1 | -0/+12 |
* | Validate struct versions in merge, revert | Edward Thomson | 2013-12-12 | 1 | -0/+2 |
* | Clean up warnings | Edward Thomson | 2013-12-09 | 1 | -8/+2 |
* | Bare naked merge and rebase | Edward Thomson | 2013-12-03 | 1 | -41/+69 |
* | clean up state metadata more consistently | Edward Thomson | 2013-12-02 | 1 | -29/+8 |
* | Introduce git_revert to revert a single commit | Edward Thomson | 2013-12-02 | 1 | -0/+217 |