summaryrefslogtreecommitdiff
path: root/zuul/merger/merger.py
Commit message (Expand)AuthorAgeFilesLines
* Merger: ensure_cloned() now looks for '.git'Antoine Musso2015-02-101-1/+1
* Fix pep8 issuesJoshua Hesketh2015-01-211-1/+1
* cloner to easily clone dependent repositoriesAntoine Musso2014-07-291-0/+4
* Add accessor for Repo._initializedAntoine Musso2014-07-291-0/+3
* Merger: support for finding branches in remoteAntoine Musso2014-07-291-0/+5
* Merger: support for pruning remotesAntoine Musso2014-07-291-0/+8
* Remove trailing spaces in debug logAntoine Musso2014-06-031-3/+3
* Merge "Add more logging to zuul merger process"Jenkins2014-03-171-1/+7
|\
| * Add more logging to zuul merger processClark Boylan2014-03-101-1/+7
* | Fix ZUUL_COMMIT in certain conditionsJames E. Blair2014-03-041-2/+2
|/
* Merger: log non Git exceptions on mergeAntoine Musso2014-02-171-2/+5
* Split the merger into a separate processJames E. Blair2014-02-171-0/+285