import-akpm: use --no-edit and --no-stat on the merge

diff --git a/import-akpm b/import-akpm
index ee8ada4a319be25bec63280a36c7be20d063cbd6..8b6d4c5c06f2b10b4bd4531ec8cc2dfe2a676b22 100755 (executable)
--- a/import-akpm
+++ b/import-akpm
@@ -63,7 +63,7 @@ git show-ref --quiet --verify "refs/heads/quilt/$name" ||
 log '$' cd ../quilt-tmp
 cd ../quilt-tmp
 execute git reset --hard "$base"
-GIT_EDITOR=: execute git merge "$nbase" || bash -i || exit 1
+execute git merge --no-edit --no-stat "$nbase" || bash -i || exit 1
 git branch base
 
 for f in $(cat "$mmotm/series"); do