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