]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
* 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
Unnamed repository; edit this file 'description' to name the repository.