| Age | Commit message (Expand) | Author | Files | Lines |
|---|---|---|---|---|
| 2007-03-24 | Use diff* with --exit-code in git-am, git-rebase and git-merge-ours |  Alex Riesen | 1 | -1/+1 |
| 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 : tgif.git | |
| Terin's Improved Git Fork | terinjokes@gmail.com |
| summaryrefslogtreecommitdiff |
path: root/git-merge-ours.sh