| commit | c07c7bf630efd8ddcd41490036c1eefb01a39f98 | |
| author | Daniel Barkalow <barkalow@iabervon.org> | |
| Mon, 10 Dec 2007 03:05:34 +0000 (9 22:05 -0500) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 10 Dec 2007 19:24:56 +0000 (10 11:24 -0800) | ||
| tree | 23170a1b2463d0dda753d81caa7a22a0a5c9964c | treesnapshot (tar.gz zip) |
| parent | e306be5cd058b957850b26e9b5053f1231543ee9 | commitdiff |
Add more checkout tests
If you have local changes that don't conflict with the
branch-switching changes, these should be kept, not cause errors even
without -m, and be reported afterwards in name-status format.
With -m, the changes carried across should be listed as well. And, for
now, include the merge-recursive output from this process.
Also test the detatched head message in at least one case.
Signed-off-by: Daniel Barkalow <barkalow@iabervon.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
If you have local changes that don't conflict with the
branch-switching changes, these should be kept, not cause errors even
without -m, and be reported afterwards in name-status format.
With -m, the changes carried across should be listed as well. And, for
now, include the merge-recursive output from this process.
Also test the detatched head message in at least one case.
Signed-off-by: Daniel Barkalow <barkalow@iabervon.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| t/t7201-co.sh | diffblobblamehistory |