On 12/10, Junio C Hamano wrote:
> Thomas Gummerer writes:
>
> > Basically the idea is to also delete files when the match
> > in 'git checkout -- ' in the current tree, but
> > don't match in .
>
> I cannot quite parse it, but perhaps.
>
> "git checkout --no-overlay -- " can
> r
Thomas Gummerer writes:
> I think I got the right solution for that in patch 5, with deleting
> the file if it's deleted in "their" version and we pass --theirs to
> 'git checkout', and analogous for --ours. I was just wondering if
> there were any further edge cases that I can't think of right
On 12/10, Elijah Newren wrote:
> On Sun, Dec 9, 2018 at 12:04 PM Thomas Gummerer wrote:
> >
> > Here's the series I mentioned a couple of times on the list already,
> > introducing a no-overlay mode in 'git checkout'. The inspiration for
> > this came from Junios message in [*1*].
> >
> > Basical
On Mon, Dec 10, 2018 at 6:18 PM Elijah Newren wrote:
> > The final step in the series is to actually make use of this in 'git
> > stash', which simplifies the code there a bit. I am however happy to
> > hold off on this step until the stash-in-C series is merged, so we
> > don't delay that furthe
On Sun, Dec 9, 2018 at 12:04 PM Thomas Gummerer wrote:
>
> Here's the series I mentioned a couple of times on the list already,
> introducing a no-overlay mode in 'git checkout'. The inspiration for
> this came from Junios message in [*1*].
>
> Basically the idea is to also delete files when the
On Sun, Dec 9, 2018 at 9:04 PM Thomas Gummerer wrote:
> My hope is also that the no-overlay mode could become the new default
> in the restore-files command Duy is currently working on.
I already wrote something like that in git-restore-files.txt even
though the implementation is not there :D
Th
Thomas Gummerer writes:
> Basically the idea is to also delete files when the match
> in 'git checkout -- ' in the current tree, but
> don't match in .
I cannot quite parse it, but perhaps.
"git checkout --no-overlay -- " can
remove paths in the index and in the working tree
Here's the series I mentioned a couple of times on the list already,
introducing a no-overlay mode in 'git checkout'. The inspiration for
this came from Junios message in [*1*].
Basically the idea is to also delete files when the match
in 'git checkout -- ' in the current tree, but
don't match
8 matches
Mail list logo
