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