Re: git loses a commit after reordering.

2017-05-02 Thread Johannes Schindelin
Hi Junio, Kevin & Nikita, On Mon, 1 May 2017, Junio C Hamano wrote: > Nikita Orlov writes: > > >>On Sun, 30 Apr 2017, 1:56 +03:00 from Kevin Daudt : > >>Not sure if this is the case here, but it at least confirms that rebase > >>--preserve-merges was not meant

Re: git loses a commit after reordering.

2017-05-01 Thread Junio C Hamano
Nikita Orlov writes: >>On Sun, 30 Apr 2017, 1:56 +03:00 from Kevin Daudt : >>Not sure if this is the case here, but it at least confirms that rebase >>--preserve-merges was not meant to reorder commits. >> >>See [this][1] thread for more background on this

Re[2]: git loses a commit after reordering.

2017-05-01 Thread Nikita Orlov
>On Sun, 30 Apr 2017, 1:56 +03:00 from Kevin Daudt : >Not sure if this is the case here, but it at least confirms that rebase >--preserve-merges was not meant to reorder commits. > >See [this][1] thread for more background on this limitation. > >[0]:

Re: git loses a commit after reordering.

2017-04-29 Thread Kevin Daudt
On Thu, Apr 27, 2017 at 10:43:16AM +0300, Nikita Orlov wrote: > Hello, my name is Nikita (male). > > Could you explain this (subject) is a bug or a feature? > > [snip] > > "Some independent changes 1" is missed and its changes are missed as well. > > I tried to move another commit to a farther

git loses a commit after reordering.

2017-04-27 Thread Nikita Orlov
Hello, my name is Nikita (male). Could you explain this (subject) is a bug or a feature? I follow Pro Git Reordering Commits (https://git-scm.com/book/en/v2/Git-Tools-Rewriting-History) to reorder commits and lose one without any conflict. I've got git under Windows 10 Enterprise 64-bit