git-pull.sh: Fix call to git-merge for new command format

diff --git a/git-sh-setup.sh b/git-sh-setup.sh
index 99cceeb858dcd2c83a040b0dd3117744e177e316..dfcb8078f508d6cc26d312d61b64e0185e90b74b 100755 (executable)
--- a/git-sh-setup.sh
+++ b/git-sh-setup.sh
@@ -107,6 +107,14 @@ git_editor() {
        eval "$GIT_EDITOR" '"$@"'
 }
 
+sane_grep () {
+       GREP_OPTIONS= LC_ALL=C grep "$@"
+}
+
+sane_egrep () {
+       GREP_OPTIONS= LC_ALL=C egrep "$@"
+}
+
 is_bare_repository () {
        git rev-parse --is-bare-repository
 }