| Age | Commit message (Expand) | Author | Files | Lines |
|---|---|---|---|---|
| 2008-07-05 | Retire 'stupid' merge strategy | Miklos Vajna | 1 | -80/+0 |
| 2007-08-30 | Fixing comment in merge strategies | Tom Clarke | 1 | -1/+1 |
| 2007-07-02 | Rewrite "git-frotz" to "git frotz" | Junio C Hamano | 1 | -5/+5 |
| 2005-09-10 | Use Daniel's read-tree in the merge strategy 'resolve'. | Junio C Hamano | 1 | -0/+80 |
 |
index : git.git | |
| The core git plumbing | Junio C. Hamano |
| aboutsummaryrefslogtreecommitdiffstats |
path: root/git-merge-stupid.sh