Added --no-edit option to git pull to silently accept non-conflicting merges