Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'rs/diff-no-minimal' | Junio C Hamano | 2010-06-13 | 1 | -1/+1 |
* | merge-file --diff3: add a label for ancestor | Jonathan Nieder | 2010-03-20 | 1 | -0/+1 |
* | xdl_merge(): move file1 and file2 labels to xmparam structure | Jonathan Nieder | 2010-03-20 | 1 | -2/+3 |
* | Merge branch 'bw/union-merge-refactor' | Junio C Hamano | 2010-03-20 | 1 | -9/+14 |
* | Move 'builtin-*' into a 'builtin/' subdirectory | Linus Torvalds | 2010-02-22 | 1 | -0/+96 |