diff options
| author | Chris Johns <chrisj@rtems.org> | 2015-03-18 08:21:34 +1100 |
|---|---|---|
| committer | Chris Johns <chrisj@rtems.org> | 2015-03-18 08:21:34 +1100 |
| commit | b0f9e30fa46a8025b76bf86321ebe585de8972f4 (patch) | |
| tree | 6d41e695fa3fde9c57df29696f2e5874a064116a /source-builder/sb/git.py | |
| parent | Add gdb-7.8.2 hash. (diff) | |
| download | rtems-source-builder-b0f9e30fa46a8025b76bf86321ebe585de8972f4.tar.bz2 | |
Add merge to the git and download modules to merge after a fetch.
Update the RTEMS tools and newlib-git to merge after the fetch.
Diffstat (limited to 'source-builder/sb/git.py')
| -rw-r--r-- | source-builder/sb/git.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/source-builder/sb/git.py b/source-builder/sb/git.py index d115845..19fbed0 100644 --- a/source-builder/sb/git.py +++ b/source-builder/sb/git.py @@ -78,6 +78,9 @@ class repo: def fetch(self): ec, output = self._run(['fetch'], check = True) + def merge(self): + ec, output = self._run(['merge'], check = True) + def pull(self): ec, output = self._run(['pull'], check = True) |