Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'cc/revert-strategy' | Junio C Hamano | 2010-05-08 | 1 | -36/+45 |
|\ | |||||
| * | merge: make function try_merge_command non static | Christian Couder | 2010-04-01 | 1 | -2/+2 |
| * | merge: refactor code that calls "git merge-STRATEGY" | Christian Couder | 2010-04-01 | 1 | -36/+45 |
* | | Merge branch 'cc/cherry-pick-ff' | Junio C Hamano | 2010-03-28 | 1 | -1/+1 |
|/ | |||||
* | Move 'builtin-*' into a 'builtin/' subdirectory | Linus Torvalds | 2010-02-22 | 1 | -0/+1292 |