projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
* jc/checkout-from-tree-keep-local-changes:
  checkout $tree $path: do not clobber local changes in $path not in $tree

1  2 
builtin/checkout.c patch | diff1 | diff2 | blob | history

diff --cc builtin/checkout.c
Simple merge
Git—the stupid content tracker