| Commit message (Expand) | Author | Age | |
|---|---|---|---|
| * | Rewrite "git-frotz" to "git frotz" | Junio C Hamano | 2007-07-02 |
| * | Use diff* with --exit-code in git-am, git-rebase and git-merge-ours | Alex Riesen | 2007-03-24 |
| * | 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