rtems/rtems-source-builder
1
0
Fork 0
mirror of https://git.rtems.org/rtems-source-builder synced 2024-10-09 07:15:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
The merge was failing for some users. Change to reset, branch master
and then pull.
This commit is contained in:
Chris Johns
2015-03-20 13:58:48 +11:00
parent ba0008c372
commit 1039ac9dbb
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rtems/config/tools/rtems-tools-1.cfg
View File

@@ -30,7 +30,7 @@
%define rtems_tools_version HEAD
%define rtems_tools_git_checkout %{nil}
%endif
%source set rtems-tools git://git.rtems.org/rtems-tools.git?fetch?reset=hard?merge?branch=master%{rtems_tools_git_checkout}
%source set rtems-tools git://git.rtems.org/rtems-tools.git?reset=hard?branch=master?pull%{rtems_tools_git_checkout}
#
# The RTEMS Tools build instructions. We use GIT Release 1.