best-in-place fixedgit add --patch  updated to gem's latest branch