| Age | Commit message (Expand) | Author | Files | Lines |
|---|---|---|---|---|
| 2022-07-22 | merge-resolve: abort if index does not match HEAD | Elijah Newren | 1 | -0/+10 |
| 2017-08-07 | scripts: use "git foo" not "git-foo" | Michael Forney | 1 | -1/+1 |
| 2009-04-22 | Convert to use quiet option when available | Dan Loewenherz | 1 | -2/+2 |
| 2007-08-30 | Fixing comment in merge strategies | Tom Clarke | 1 | -1/+1 |
| 2007-07-02 | Rewrite "git-frotz" to "git frotz" | Junio C Hamano | 1 | -3/+3 |
| 2007-02-03 | Assorted typo fixes | Pavel Roskin | 1 | -1/+1 |
| 2006-02-06 | read-tree --aggressive | Junio C Hamano | 1 | -1/+1 |
| 2005-10-03 | [PATCH] Enable and fix support for base less merges. | Fredrik Kuivinen | 1 | -0/+6 |
| 2005-09-10 | Use Daniel's read-tree in the merge strategy 'resolve'. | Junio C Hamano | 1 | -35/+3 |
| 2005-09-10 | Multi-backend merge driver. | Junio C Hamano | 1 | -0/+80 |
 |
index : git.git | |
| The core git plumbing | Junio C. Hamano |
| aboutsummaryrefslogtreecommitdiffstats |
path: root/git-merge-resolve.sh