| Age | Commit message (Expand) | Author |
|---|---|---|
| 2017-08-07 | scripts: use "git foo" not "git-foo" | Michael Forney |
| 2009-04-22 | Convert to use quiet option when available | Dan Loewenherz |
| 2007-08-30 | Fixing comment in merge strategies | Tom Clarke |
| 2007-07-02 | Rewrite "git-frotz" to "git frotz" | Junio C Hamano |
| 2007-02-03 | Assorted typo fixes | Pavel Roskin |
| 2006-02-06 | read-tree --aggressive | Junio C Hamano |
| 2005-10-03 | [PATCH] Enable and fix support for base less merges. | Fredrik Kuivinen |
| 2005-09-10 | Use Daniel's read-tree in the merge strategy 'resolve'. | Junio C Hamano |
| 2005-09-10 | Multi-backend merge driver. | Junio C Hamano |
 |
index : user/sven/git.git | |
| Git | Sven Wegener |
| summaryrefslogtreecommitdiff |
path: root/git-merge-resolve.sh