Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'em/checkout-orphan' | Junio C Hamano | 2010-05-21 | 1 | -2/+13 |
|\ | |||||
| * | git checkout: create unparented branch by --orphan | Erick Mattos | 2010-03-21 | 1 | -2/+13 |
* | | checkout -m --conflict=diff3: add a label for ancestor | Jonathan Nieder | 2010-03-20 | 1 | -0/+1 |
* | | checkout --conflict=diff3: add a label for ancestor | Jonathan Nieder | 2010-03-20 | 1 | -1/+1 |
* | | ll_merge(): add ancestor label parameter for diff3-style output | Jonathan Nieder | 2010-03-20 | 1 | -1/+1 |
|/ | |||||
* | Merge branch 'lt/deepen-builtin-source' | Junio C Hamano | 2010-03-10 | 1 | -21/+3 |
* | Move 'builtin-*' into a 'builtin/' subdirectory | Linus Torvalds | 2010-02-22 | 1 | -0/+853 |