scripts/feeds: merge git branch support from r24285