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