diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-06-07 18:36:30 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-07 18:41:51 (GMT) |
| commit | c859600954df4c292ec7c81d7f2f9d0a62b5975b (patch) | |
| tree | 4c2f1d9fae4deff6e82d0f32f11cc14cd67093c3 /diff-files.c | |
| parent | 63aff4fed94355889be98ad44371e29942ff70e4 (diff) | |
| download | git-c859600954df4c292ec7c81d7f2f9d0a62b5975b.zip git-c859600954df4c292ec7c81d7f2f9d0a62b5975b.tar.gz git-c859600954df4c292ec7c81d7f2f9d0a62b5975b.tar.bz2 | |
[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>
Diffstat (limited to 'diff-files.c')
0 files changed, 0 insertions, 0 deletions