| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | scripts: use "git foo" not "git-foo" | Michael Forney | 2017-08-07 | 1 | -1/+1 |
| * | Convert to use quiet option when available | Dan Loewenherz | 2009-04-22 | 1 | -2/+2 |
| * | 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 | -3/+3 |
| * | Assorted typo fixes | Pavel Roskin | 2007-02-03 | 1 | -1/+1 |
| * | read-tree --aggressive | Junio C Hamano | 2006-02-06 | 1 | -1/+1 |
| * | [PATCH] Enable and fix support for base less merges. | Fredrik Kuivinen | 2005-10-03 | 1 | -0/+6 |
| * | Use Daniel's read-tree in the merge strategy 'resolve'. | Junio C Hamano | 2005-09-10 | 1 | -35/+3 |
| * | Multi-backend merge driver. | Junio C Hamano | 2005-09-10 | 1 | -0/+80 |
 |
index : rhi/git | |
| Roland Hieber |
| summaryrefslogtreecommitdiffstats |
path: root/git-merge-resolve.sh