Re: [PATCH 0/3] fix working directory file issues while using sparse-checkout

2017-04-07 Thread Stefan Beller
This time for real. On Fri, Apr 7, 2017 at 12:27 PM, Stefan Beller wrote: > + Duy, for sparse checkout > > On Fri, Apr 7, 2017 at 12:23 PM, Kevin Willford wrote: >> While using the sparse-checkout feature there are scenarios where >> the working directory should and should not be updated. This

Re: [PATCH 0/3] fix working directory file issues while using sparse-checkout

2017-04-07 Thread Stefan Beller
+ Duy, for sparse checkout On Fri, Apr 7, 2017 at 12:23 PM, Kevin Willford wrote: > While using the sparse-checkout feature there are scenarios where > the working directory should and should not be updated. This patch > series addresses issues found in reset, apply, and merge conflicts. > > Kev

[PATCH 0/3] fix working directory file issues while using sparse-checkout

2017-04-07 Thread Kevin Willford
While using the sparse-checkout feature there are scenarios where the working directory should and should not be updated. This patch series addresses issues found in reset, apply, and merge conflicts. Kevin Willford (3): merge-recursive.c: conflict using sparse should update file apply.c: do