Re: [BUG] [git 2.16.1] yeeek ... my files are gone .. by git pull

On Mon, Mar 05, 2018 at 03:49:13PM +0100, Johannes Schindelin wrote: > > I think that is doing the right thing for half of the problem. But > > there's something else funny where we do not include the "upstream" > > commits from the split history (i.e., we rebase onto nothing, > > whereas a

Re: [BUG] [git 2.16.1] yeeek ... my files are gone .. by git pull

Hi Peff, On Wed, 28 Feb 2018, Jeff King wrote: > On Tue, Feb 27, 2018 at 12:33:56AM +0100, Johannes Schindelin wrote: > > > > So something like this helps: > > > > > > diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh > > > index 81c5b42875..71e6cbb388 100644 > > > ---

Re: [BUG] [git 2.16.1] yeeek ... my files are gone .. by git pull

On Tue, Feb 27, 2018 at 12:33:56AM +0100, Johannes Schindelin wrote: > > So something like this helps: > > > > diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh > > index 81c5b42875..71e6cbb388 100644 > > --- a/git-rebase--interactive.sh > > +++ b/git-rebase--interactive.sh >

Re: [BUG] [git 2.16.1] yeeek ... my files are gone .. by git pull

Hi Peff, On Fri, 23 Feb 2018, Jeff King wrote: > On Fri, Feb 23, 2018 at 06:29:55AM +0100, "Marcel 'childNo͡.de' Trautwein" > wrote: > > > shows me a quite different behavior, so solely rebase not seems the > > full problem BUT `--rebase=preserve` will .. o’man , really, is this > > intended?

Re: [BUG] [git 2.16.1] yeeek ... my files are gone .. by git pull

On Fri, Feb 23, 2018 at 06:29:55AM +0100, "Marcel 'childNo͡.de' Trautwein" wrote: > shows me a quite different behavior, so solely rebase not seems the full > problem > BUT > `--rebase=preserve` will .. o’man , really, is this intended? Yeah, the bug seems to be in --preserve-merges. Here's an

Re: [BUG] [git 2.16.1] yeeek ... my files are gone .. by git pull

> Am 23.02.2018 um 00:20 schrieb Jonathan Nieder : > > Hi Marcel, > > … > Sorry, this is not the most helpful reply but: > > Can you describe a reproduction recipe so that I can experience the > same thing? > > That is: > > 1. steps to reproduce > 2. expected result > 3.

Re: [BUG] [git 2.16.1] yeeek ... my files are gone .. by git pull

Hi Marcel, Marcel 'childNo͡.de' Trautwein" wrote: > I think we have a problem … or at least I had > and I’m not quite sure if this is „working as designed“ > but I’m sure it „should not work as it did“. [...] > I wanted to clone another repository … but yeah … it’s late for me today and > I put

[BUG] [git 2.16.1] yeeek ... my files are gone .. by git pull

Hi, I think we have a problem … or at least I had and I’m not quite sure if this is „working as designed“ but I’m sure it „should not work as it did“. Because? It pruned a lot of files and even the local repository. by pull by giving another repository URL instead of a known remote While