Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix sparse warnings | Stephen Boyd | 2011-03-22 | 1 | -1/+1 |
* | Merge branch 'jf/merge-ignore-ws' | Junio C Hamano | 2010-10-26 | 1 | -13/+2 |
|\ | |||||
| * | merge-recursive --patience | Justin Frankel | 2010-08-26 | 1 | -0/+1 |
| * | merge-recursive: expose merge options for builtin merge | Jonathan Nieder | 2010-08-26 | 1 | -13/+1 |
* | | Merge branch 'jn/merge-renormalize' | Junio C Hamano | 2010-09-03 | 1 | -0/+4 |
|\ \ | |/ | |||||
| * | merge-recursive --renormalize | Jonathan Nieder | 2010-08-06 | 1 | -0/+4 |
* | | builtin/merge_recursive.c: Add an usage string and make use of it. | Thiago Farina | 2010-09-03 | 1 | -1/+4 |
|/ | |||||
* | Move 'builtin-*' into a 'builtin/' subdirectory | Linus Torvalds | 2010-02-22 | 1 | -0/+84 |