Merge branch 'jc/checkout-from-tree-keep-local-changes' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 21 Oct 2011 17:49:24 +0000 (10:49 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 21 Oct 2011 17:49:24 +0000 (10:49 -0700)
commitdf68408...5d24c2f54c0b8a66cbac33d8af43333a
tree355715d...b644e9fd88307485c424dfadcdae7e81copy hash to clipboard (tree)
parent634b29d...705af2e05d593b75ade2be64033468a5copy hash to clipboard (diff)
parent0a1283b...3955a97557019d077b96669c5c93c551copy hash to clipboard (diff)
builtin/checkout.c