| commit | 8f1b0637c15bdd67170db423c86f06ee5db273b7 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 2 Jun 2008 05:55:33 +0000 (1 22:55 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 2 Jun 2008 05:55:36 +0000 (1 22:55 -0700) | ||
| tree | 070d6b51f06755291dae6768c29395ee09f1d166 | treesnapshot (tar.gz zip) |
| parent | 68100531547f9abd00362e31282155efdc040a4c | commitdiff |
| parent | 291d823e364cb51cab67f0786b809fe038b92aa8 | commitdiff |
Merge branch 'jc/checkout'
* 'jc/checkout':
checkout: "best effort" checkout
unpack_trees(): allow callers to differentiate worktree errors from merge errors
checkout: consolidate reset_{to_new,clean_to_new}()
checkout: make reset_clean_to_new() not die by itself
* 'jc/checkout':
checkout: "best effort" checkout
unpack_trees(): allow callers to differentiate worktree errors from merge errors
checkout: consolidate reset_{to_new,clean_to_new}()
checkout: make reset_clean_to_new() not die by itself