| Age | Commit message (Expand) | Author |
|---|---|---|
| 2007-07-03 | Rewrite "git-frotz" to "git frotz" | Junio C Hamano |
| 2007-03-25 | Use diff* with --exit-code in git-am, git-rebase and git-merge-ours | Alex Riesen |
| 2005-11-04 | git-merge-ours: make sure our index matches HEAD | Junio C Hamano |
| 2005-11-04 | Add 'ours' merge strategy. | Junio C Hamano |
Welcome to mirror list, hosted at ThFree Co, Russian Federation.
 |
index : git.kernel.org/pub/scm/git/git.git | |
| Unnamed repository; edit this file 'description' to name the repository. | root |
| summaryrefslogtreecommitdiff |
path: root/git-merge-ours.sh