diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-06-01 22:55:33 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-06-01 22:55:36 -0700 |
| commit | 8f1b0637c15bdd67170db423c86f06ee5db273b7 (patch) | |
| tree | 070d6b51f06755291dae6768c29395ee09f1d166 /commit.c | |
| parent | 68100531547f9abd00362e31282155efdc040a4c (diff) | |
| parent | 291d823e364cb51cab67f0786b809fe038b92aa8 (diff) | |
| download | git-8f1b0637c15bdd67170db423c86f06ee5db273b7.tar.gz | |
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
Diffstat (limited to 'commit.c')
0 files changed, 0 insertions, 0 deletions