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