On 10/09/2014 01:50 PM, Fabian Ruch wrote:
Hi David,
I don't think you made a mistake at all. If I understand the --merge
mode of git-rebase correctly there is no need to require a parent.
The error occurs when the script tries to determine the changes your
merge commit introduces, which include
If you have a git tree and you merge in another, independent git tree so
that they are the same, using a merge strategy like this:
$ git merge importing/master -s recursive -Xours
And if you later on want to rebase this merge commit on a newer upstream
for whatever reason, you get something li
2 matches
Mail list logo
