RE: git merge deletes my changes

2016-10-12 Thread Eduard Egorov
gorov; 'git@vger.kernel.org' Subject: Re: git merge deletes my changes W dniu 10.10.2016 o 19:52, Paul Smith pisze: > On Mon, 2016-10-10 at 10:19 +, Eduard Egorov wrote: >> # ~/gitbuild/git-2.10.1/git merge -s subtree --squash ceph_ansible >> >> Can somebody co

Re: git merge deletes my changes

2016-10-11 Thread Jakub Narębski
W dniu 10.10.2016 o 19:52, Paul Smith pisze: > On Mon, 2016-10-10 at 10:19 +, Eduard Egorov wrote: >> # ~/gitbuild/git-2.10.1/git merge -s subtree --squash ceph_ansible >> >> Can somebody confirm this please? Doesn't "merge -s subtree" really >> merges branches? > > I think possibly you're not

RE: git merge deletes my changes

2016-10-11 Thread Eduard Egorov
works-incorrectly ) - I will accept it with great pleasure ;-) With best regards Eduard Egorov -Original Message- From: Paul Smith [mailto:p...@mad-scientist.net] Sent: Monday, October 10, 2016 8:52 PM To: Eduard Egorov ; 'git@vger.kernel.org' Subject: Re: git merge deletes my cha

Re: git merge deletes my changes

2016-10-10 Thread Paul Smith
On Mon, 2016-10-10 at 10:19 +, Eduard Egorov wrote: > # ~/gitbuild/git-2.10.1/git merge -s subtree --squash ceph_ansible > > Can somebody confirm this please? Doesn't "merge -s subtree" really > merges branches? I think possibly you're not fully understanding what the --squash flag does... th

RE: git merge deletes my changes

2016-10-10 Thread Eduard Egorov
se repos doesn't has any relations, right). Can somebody confirm this please? Doesn't "merge -s subtree" really merges branches? With best regards Eduard Egorov -Original Message- From: Eduard Egorov Sent: Monday, October 10, 2016 12:39 PM To: 'git@vger.kernel.org&#x

Re: git merge deletes my changes

2016-10-10 Thread Jeff King
stopped before committing as requested When you merge from ceph_ansible, there is no shared history, and git uses the empty tree as a common ancestor. It looks like the other side added site.yml.sample, for instance, because that is a change from the empty tree. > A post on SO: > http://st

git merge deletes my changes

2016-10-10 Thread Eduard Egorov
his behavior. Could you help me please? What information can I provide in order to troubleshoot this issue? A post on SO: http://stackoverflow.com/questions/39954265/git-merge-deletes-my-changes With best regards Eduard Egorov