![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <junkio@cox.net> | |
| Tue, 7 Jun 2005 18:36:30 +0000 (11:36 -0700) | ||
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | |
| Tue, 7 Jun 2005 18:41:51 +0000 (11:41 -0700) | ||
| commit | c859600954df4c292ec7c81d7f2f9d0a62b5975b | |
| tree | 4c2f1d9fae4deff6e82d0f32f11cc14cd67093c3 | tree | snapshot |
| parent | 63aff4fed94355889be98ad44371e29942ff70e4 | commit | diff |
[PATCH] read-tree: save more user hassles during fast-forward.
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>
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>
| Documentation/git-read-tree.txt | diff | blob | history | |
| read-tree.c | diff | blob | history | |
| t/t1001-read-tree-m-2way.sh | [new file with mode: 0755] | blob |
| t/t1002-read-tree-m-u-2way.sh | [new file with mode: 0755] | blob |