track ci for upgrade to git 1.7.3 --------------------------------- Key: JBTM-1315 URL: https://issues.jboss.org/browse/JBTM-1315 Project: JBoss Transaction Manager Issue Type: Feature Request Security Level: Public(Everyone can see) Components: Build System, Testing Reporter: Tom Jenkinson When this occurs we can back out the while loop that does a rebase and use the standard -s recursive -Xtheirs