Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | s/git_merge_head/git_annotated_commit | Edward Thomson | 2014-10-26 | 1 | -4/+5 |
* | Modify GIT_MERGE_CONFIG -> GIT_MERGE_PREFERENCE | Edward Thomson | 2014-05-27 | 1 | -18/+18 |
* | Move GIT_MERGE_CONFIG_* to its own enum | Edward Thomson | 2014-05-27 | 1 | -31/+38 |
* | Introduce GIT_MERGE_CONFIG_* for merge.ff settings | Edward Thomson | 2014-05-27 | 1 | -0/+26 |
* | UNBORN implies FAST_FORWARD | Edward Thomson | 2014-03-20 | 1 | -1/+2 |
* | Introduce GIT_MERGE_ANALYSIS_UNBORN | Edward Thomson | 2014-03-20 | 1 | -4/+20 |
* | git_merge_status -> git_merge_analysis | Edward Thomson | 2014-03-20 | 1 | -0/+90 |