Merge branch 'maint'

diff --git a/git-am.sh b/git-am.sh
index 6d1848b6cce89e4953a3ca6e1b2e6e1611277a4a..578780be138b216dc89333e1fde87ddcb91e5e54 100755 (executable)
--- a/git-am.sh
+++ b/git-am.sh
@@ -44,11 +44,7 @@ else
 fi
 
 sq () {
-       for sqarg
-       do
-               printf "%s" "$sqarg" |
-               sed -e 's/'\''/'\''\\'\'''\''/g' -e 's/.*/ '\''&'\''/'
-       done
+       git rev-parse --sq-quote "$@"
 }
 
 stop_here () {