Bug 838321: gittool improvements r=rail