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
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
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
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
Hello again,
I've noticed that my git is quite old (1.8.3) and built it from source tarball
(2.10.1). Now the output is:
# ~/gitbuild/git-2.10.1/git merge -s subtree --squash ceph_ansible
fatal: refusing to merge unrelated histories
I've checked my command history again:
738 git rm -rf ceph-
On Mon, Oct 10, 2016 at 09:39:13AM +, Eduard Egorov wrote:
> A week ago, I've reset a state of 'ceph-ansible' folder in %current%
> branch with code from corresponding branch (that tracks an upstream
> from github):
>
> # git read-tree --prefix=ceph-ansible/ -u ceph_ansible
This pulls in the
6 matches
Mail list logo
