| Age | Commit message (Expand) | Author | Files | Lines |
|---|---|---|---|---|
| 2005-12-02 | merge-one-file: make sure we do not mismerge symbolic links. |  Junio C Hamano | 1 | -0/+8 |
| 2005-12-02 | merge-one-file: make sure we create the merged file. | Junio C Hamano | 1 | -1/+7 |
| 2005-12-01 | git-merge-one-file: do not worry about 'rmdir -p' not removing directory. | Junio C Hamano | 1 | -1/+1 |
| 2005-11-30 | merge-one-file: leave unmerged index entries upon automerge failure. |  Linus Torvalds | 1 | -5/+1 |
| 2005-11-20 | merge-one-file: use rmdir -p | Junio C Hamano | 1 | -5/+1 |
| 2005-11-19 | merge-one-file: remove empty directories | Junio C Hamano | 1 | -1/+6 |
| 2005-11-11 | merge-one-file: use empty- or common-base condintionally in two-stage merge. | Junio C Hamano | 1 | -0/+6 |
| 2005-11-11 | merge-one-file: use common as base, instead of emptiness. | Junio C Hamano | 1 | -2/+4 |
| 2005-11-11 | merge with /dev/null as base, instead of punting O==empty case | Junio C Hamano | 1 | -4/+16 |
| 2005-09-07 | Big tool rename. | Junio C Hamano | 1 | -0/+88 |
 |
index : tgif.git | |
| Terin's Improved Git Fork | terinjokes@gmail.com |
| summaryrefslogtreecommitdiff |
path: root/git-merge-one-file.sh