| Commit message (Expand) | Author | Age | |
|---|---|---|---|
| * | git-merge-ours: make sure our index matches HEAD | Junio C Hamano | 2005-11-03 |
| * | Add 'ours' merge strategy. | Junio C Hamano | 2005-11-03 |
 |
index : org/kernel/git.git | |
| forked from git/git | git |
| aboutsummaryrefslogtreecommitdiff |
path: root/git-merge-ours.sh