git-am: add --directory=<dir> option

diff --git a/git-mergetool.sh b/git-mergetool.sh
index f04240dacaba88bfdac49b0e6e14047b1008a956..b2d53752ae49ff2c8323836e2907de584cb1e979 100755 (executable)
--- a/git-mergetool.sh
+++ b/git-mergetool.sh
@@ -312,6 +312,7 @@ do
            prompt=true
            ;;
        --)
+           shift
            break
            ;;
        -*)