Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Use Daniel's read-tree in the merge strategy 'resolve'. | Junio C Hamano | 2005-09-11 | 1 | -0/+80 |
And rename the one Linus kept calling stupid, 'stupid'. Signed-off-by: Junio C Hamano <junkio@cox.net> |
index : git | ||
git | Fast-forward packages |
summaryrefslogtreecommitdiffstats |
Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Use Daniel's read-tree in the merge strategy 'resolve'. | Junio C Hamano | 2005-09-11 | 1 | -0/+80 |
And rename the one Linus kept calling stupid, 'stupid'. Signed-off-by: Junio C Hamano <junkio@cox.net> |