| Age | Commit message (Expand) | Author | Files | Lines |
|---|---|---|---|---|
| 2005-11-03 | git-merge-ours: make sure our index matches HEAD | Junio C Hamano | 1 | -0/+7 |
| 2005-11-03 | Add 'ours' merge strategy. | Junio C Hamano | 1 | -0/+7 |
 |
index : git.git | |
| The core git plumbing | Junio C. Hamano |
| aboutsummaryrefslogtreecommitdiffstats |
path: root/git-merge-ours.sh