Merge "Add 's' option to grep so it doesn't complain about stuff under .git"