projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 634b29d 0a1283b)
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)
commitdf6840855d24c2f54c0b8a66cbac33d8af43333a
tree355715d1b644e9fd88307485c424dfadcdae7e81tree | snapshot
parent634b29d2705af2e05d593b75ade2be64033468a5commit | diff
parent0a1283bc3955a97557019d077b96669c5c93c551commit | diff
Merge branch 'jc/checkout-from-tree-keep-local-changes' into maint

* jc/checkout-from-tree-keep-local-changes:
  checkout $tree $path: do not clobber local changes in $path not in $tree
builtin/checkout.c diff1 | diff2 | blob | history
Git—the stupid content tracker