Loosen "working file will be lost" check in Porcelain-ish

diff --git a/git-merge.sh b/git-merge.sh
index 272f004622572ad2aed62268d9a75cac5a8fa751..397b33f8d33b67018669cb4610a2051407fc3eb7 100755 (executable)
--- a/git-merge.sh
+++ b/git-merge.sh
@@ -264,7 +264,7 @@ f,*)
        echo "Updating $(git-rev-parse --short $head)..$(git-rev-parse --short $1)"
        git-update-index --refresh 2>/dev/null
        new_head=$(git-rev-parse --verify "$1^0") &&
-       git-read-tree -u -v -m $head "$new_head" &&
+       git-read-tree -v -m -u --exclude-per-directory=.gitignore $head "$new_head" &&
        finish "$new_head" "Fast forward"
        dropsave
        exit 0