| Age | Commit message (Expand) | Author | Files | Lines |
|---|---|---|---|---|
| 2010-02-22 | Move 'builtin-*' into a 'builtin/' subdirectory | Linus Torvalds | 1 | -34/+0 |
| 2009-11-09 | Show usage string for 'git merge-ours -h' | Jonathan Nieder | 1 | -0/+6 |
| 2007-11-22 | git-merge-ours: make it a builtin. | Thomas Harning | 1 | -0/+28 |
 |
index : git.git | |
| The core git plumbing | Junio C. Hamano |
| aboutsummaryrefslogtreecommitdiffstats |
path: root/builtin-merge-ours.c