Age | Commit message (Expand) | Author |
---|---|---|
2008-11-24 | merge-recursive: use strbuf_expand() instead of interpolate() | René Scharfe |
2008-08-31 | git-merge-recursive: learn to honor merge.conflictstyle | Junio C Hamano |
2008-05-14 | Provide git_config with a callback-data parameter | Johannes Schindelin |
2008-02-18 | merge-recursive: split low-level merge functions out. | Junio C Hamano |