[rtems-source-builder commit] rtems/tools: Change the order of the git URL to not do a merge.

[Chris Johns]

Module:    rtems-source-builder
Branch:    master
Commit:    1039ac9dbb681a99d5dc1bfa214053c0917418e1
Changeset: http://git.rtems.org/rtems-source-builder/commit/?id=1039ac9dbb681a99d5dc1bfa214053c0917418e1

Author:    Chris Johns <chrisj at rtems.org>
Date:      Fri Mar 20 13:58:48 2015 +1100

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.

---

 rtems/config/tools/rtems-tools-1.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rtems/config/tools/rtems-tools-1.cfg b/rtems/config/tools/rtems-tools-1.cfg
index aebf3c5..f770d29 100644
--- a/rtems/config/tools/rtems-tools-1.cfg
+++ b/rtems/config/tools/rtems-tools-1.cfg
@@ -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.