| Age | Commit message (Collapse) | Author | |
|---|---|---|---|
| 2005-06-07 | [PATCH] read-tree: save more user hassles during fast-forward. | Junio C Hamano | |
| This implements the "never lose the current cache information or the work tree state, but favor a successful merge over merge failure" principle in the fast-forward two-tree merge operation. It comes with a set of tests to cover all the cases described in the case matrix found in the new documentation. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org> | |||
 |
index : git | |
| Git: sistema de control de versiones | mirror |
| summaryrefslogtreecommitdiff |