| Age | Commit message (Expand) | Author |
|---|---|---|
| 2005-11-11 | 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-09-07 | Big tool rename. | Junio C Hamano |
 |
index : git | |
| Fork of git SCM with my patches. |
| summaryrefslogtreecommitdiff |
path: root/git-merge-one-file.sh