| Commit message (Expand) | Author | Age | |
|---|---|---|---|
| * | Retire 'stupid' merge strategy | Miklos Vajna | 2008-07-05 |
| * | Fixing comment in merge strategies | Tom Clarke | 2007-08-30 |
| * | Rewrite "git-frotz" to "git frotz" | Junio C Hamano | 2007-07-02 |
| * | Use Daniel's read-tree in the merge strategy 'resolve'. | Junio C Hamano | 2005-09-10 |
 |
index : org/kernel/git.git | |
| forked from git/git | git |
| aboutsummaryrefslogtreecommitdiff |
path: root/git-merge-stupid.sh