Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | merge: rename `git_merge_tree_flags_t` -> `git_merge_flags_t` | Edward Thomson | 2015-11-25 | 1 | -2/+2 |
* | Renamed git_merge_options 'flags' to 'tree_flags' | Jacques Germishuys | 2015-03-16 | 1 | -2/+2 |
* | reset: remove reflog message override | Carlos Martín Nieto | 2015-03-03 | 1 | -10/+10 |
* | Remove the signature from ref-modifying functions | Carlos Martín Nieto | 2015-03-03 | 1 | -10/+10 |
* | Fix test build | Carlos Martín Nieto | 2014-10-10 | 1 | -1/+1 |
* | Merge pull request #2499 from csware/hard-reset-checkout-callbacks | Carlos Martín Nieto | 2014-10-10 | 1 | -9/+9 |
|\ | |||||
| * | Allow to propagate checkout callbacks to git HARD reset | Sven Strickroth | 2014-08-03 | 1 | -9/+9 |
* | | Added test case to illustrate bogus conflicts detected if no files were merge... | Jacques Germishuys | 2014-09-12 | 1 | -0/+41 |
|/ | |||||
* | git_cherry_pick -> git_cherrypick | Edward Thomson | 2014-07-22 | 2 | -29/+29 |
* | Added cherry pick tests | Jacques Germishuys | 2014-04-14 | 2 | -0/+535 |