| Commit message (Expand) | Author | Age |
|---|
| * | git-merge-one-file: fix longstanding stupid thinko | Junio C Hamano | 2008-03-18 |
| * | Support a merge with conflicting gitlink change | Junio C Hamano | 2007-12-11 |
| * | Fix merge-one-file for our-side-added/our-side-removed cases | Junio C Hamano | 2007-07-08 |
| * | Rewrite "git-frotz" to "git frotz" | Junio C Hamano | 2007-07-02 |
| * | War on whitespace | Junio C Hamano | 2007-06-07 |
| * | Use git-merge-file in git-merge-one-file, too | Johannes Schindelin | 2006-12-21 |
| * | merge: loosen overcautious "working file will be lost" check. | Junio C Hamano | 2006-10-27 |
| * | Fix more typos, primarily in the code | Pavel Roskin | 2006-07-10 |
| * | Shell utilities: Guard against expr' magic tokens. | Mark Wooding | 2006-04-13 |
| * | trivial: remove the dots at the end of file names from merge-one-file | Alex Riesen | 2006-01-05 |
| * | git-merge-one: new merge world order. | Junio C Hamano | 2005-12-07 |
| * | git-merge-one-file: resurrect leading path creation. | Junio C Hamano | 2005-12-06 |
| * | merge-one-file: make sure we do not mismerge symbolic links. | Junio C Hamano | 2005-12-02 |
| * | merge-one-file: make sure we create the merged file. | Junio C Hamano | 2005-12-02 |
| * | git-merge-one-file: do not worry about 'rmdir -p' not removing directory. | Junio C Hamano | 2005-12-01 |
| * | merge-one-file: leave unmerged index entries upon automerge failure. | Linus Torvalds | 2005-11-30 |
| * | merge-one-file: use rmdir -p | Junio C Hamano | 2005-11-20 |
| * | merge-one-file: remove empty directories | Junio C Hamano | 2005-11-19 |
| * | merge-one-file: use empty- or common-base condintionally in two-stage merge. | Junio C Hamano | 2005-11-11 |
| * | merge-one-file: use common as base, instead of emptiness. | Junio C Hamano | 2005-11-11 |
| * | merge with /dev/null as base, instead of punting O==empty case | Junio C Hamano | 2005-11-11 |
| * | Big tool rename. | Junio C Hamano | 2005-09-07 |
