Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'jn/merge-diff3-label' | Junio C Hamano | 2010-04-03 |
|\ | |||
| * | cherry-pick, revert: add a label for ancestor | Jonathan Nieder | 2010-03-20 |
| * | revert: clarify label on conflict hunks | Jonathan Nieder | 2010-03-20 |
* | | Merge branch 'cc/cherry-pick-ff' | Junio C Hamano | 2010-03-28 |
|/ | |||
* | Move 'builtin-*' into a 'builtin/' subdirectory | Linus Torvalds | 2010-02-22 |