Complex rebasing
Doug Simon
doug.simon at oracle.com
Fri Dec 9 15:50:05 UTC 2016
I will do the merge for you and push to my github fork which you can then pull from.
-Doug
> On 9 Dec 2016, at 16:36, Andrew Haley <aph at redhat.com> wrote:
>
> On 08/12/16 19:15, Doug Simon wrote:
>> I also have a rather large pending change on a branch where the rename is causing me headaches. Here is what I did after much googling:
>>
>> dsimon at kurz-3 ~/g/graal-core> git branch
>> master
>> * topic/non-static-options
>> dsimon at kurz-3 ~/g/graal-core> git fetch -p ssh://git@github.com/graalvm/graal-core.git
>> dsimon at kurz-3 ~/g/graal-core> git -c diff.renameLimit=3000 merge -s recursive -X rename-threshold=10% -X patience master
>>
>> That leaves me in a state where I have about 282 files with conflicts (which I expected).
>
> Doesn't seem to do anything:
>
> mercury:graal-core $ git fetch -p ssh://git@github.com/graalvm/graal-core.git
> Enter passphrase for key '/home/aph/.ssh/id_rsa':
> mercury:graal-core $ git -c diff.renameLimit=3000 merge -s recursive -X rename-threshold=10% -X patience master
> Unknown option: -c
> usage: git [--version] [--exec-path[=GIT_EXEC_PATH]] [--html-path]
> [-p|--paginate|--no-pager] [--no-replace-objects]
> [--bare] [--git-dir=GIT_DIR] [--work-tree=GIT_WORK_TREE]
> [--help] COMMAND [ARGS]
> mercury:graal-core $ git merge -s recursive -X rename-threshold=10% -X patience master
> Already up-to-date.
>
> Andrew.
>
More information about the graal-dev
mailing list