projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: a9af6c4 0a1283b)
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)
commit66d2c22f416cda652f08e8db5820abf3e87592e5
treead4e5e2e38eec22aa6cb769e5d2d1dd896b19629tree | snapshot
parenta9af6c451d68267a605b7b7385cdffa939b167b2commit | diff
parent0a1283bc3955a97557019d077b96669c5c93c551commit | diff
Merge branch 'jc/checkout-from-tree-keep-local-changes'

* 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