Changeset 1039ac9 in rtems-source-builder


Ignore:
Timestamp:
Mar 20, 2015, 2:58:48 AM (4 years ago)
Author:
Chris Johns <chrisj@…>
Branches:
4.10, 4.11, 4.9, master
Children:
6523533
Parents:
ba0008c
Message:

rtems/tools: Change the order of the git URL to not do a merge.

The merge was failing for some users. Change to reset, branch master
and then pull.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • rtems/config/tools/rtems-tools-1.cfg

    rba0008c r1039ac9  
    3131  %define rtems_tools_git_checkout %{nil}
    3232 %endif
    33  %source set rtems-tools git://git.rtems.org/rtems-tools.git?fetch?reset=hard?merge?branch=master%{rtems_tools_git_checkout}
     33 %source set rtems-tools git://git.rtems.org/rtems-tools.git?reset=hard?branch=master?pull%{rtems_tools_git_checkout}
    3434
    3535 #
Note: See TracChangeset for help on using the changeset viewer.