Age | Commit message (Expand) | Author | Files | Lines |
---|---|---|---|---|
2010-03-20 | checkout -m --conflict=diff3: add a label for ancestor | Jonathan Nieder | 1 | -0/+1 |
2010-03-20 | checkout --conflict=diff3: add a label for ancestor | Jonathan Nieder | 1 | -1/+1 |
2010-03-20 | ll_merge(): add ancestor label parameter for diff3-style output | Jonathan Nieder | 1 | -1/+1 |
2010-03-10 | Merge branch 'lt/deepen-builtin-source' | Junio C Hamano | 1 | -0/+835 |
2010-02-22 | Move 'builtin-*' into a 'builtin/' subdirectory | Linus Torvalds | 1 | -0/+853 |