Merge branch 'jc/checkout-from-tree-keep-local-changes'
authorJunio C Hamano <gitster@pobox.com>
Tue, 18 Oct 2011 04:37:09 +0000 (21:37 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 18 Oct 2011 04:37:09 +0000 (21:37 -0700)
commit66d2c22...416cda652f08e8db5820abf3e87592e5
treead4e5e2...38eec22aa6cb769e5d2d1dd896b19629copy hash to clipboard (tree)
parenta9af6c4...1d68267a605b7b7385cdffa939b167b2copy hash to clipboard (diff)
parent0a1283b...3955a97557019d077b96669c5c93c551copy hash to clipboard (diff)
builtin/checkout.c