From e25ccd56bc26214dab1ad640db443ca95cd5a5e3 Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Sun, 27 May 2012 23:31:20 +1000
Subject: [PATCH] import-akpm: use --no-edit and --no-stat on the merge

---
 import-akpm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/import-akpm b/import-akpm
index ee8ada4..8b6d4c5 100755
--- 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
-- 
2.39.5