Age | Commit message (Expand) | Author | Files | Lines |
---|---|---|---|---|
2010-10-18 | merge-file: correctly find files when called in subdir | Thomas Rast | 1 | -1/+6 |
2010-08-15 | merge-file: run setup_git_directory_gently() sooner | Nguyễn Thái Ngọc Duy | 1 | -3/+1 |
2010-06-13 | Merge branch 'rs/diff-no-minimal' | Junio C Hamano | 1 | -1/+1 |
2010-03-20 | merge-file --diff3: add a label for ancestor | Jonathan Nieder | 1 | -0/+1 |
2010-03-20 | xdl_merge(): move file1 and file2 labels to xmparam structure | Jonathan Nieder | 1 | -2/+3 |
2010-03-20 | Merge branch 'bw/union-merge-refactor' | Junio C Hamano | 1 | -9/+14 |
2010-02-22 | Move 'builtin-*' into a 'builtin/' subdirectory | Linus Torvalds | 1 | -0/+96 |