From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Sun, 27 May 2012 13:31:20 +0000 (+1000)
Subject: import-akpm: use --no-edit and --no-stat on the merge
X-Git-Url: http://git.ozlabs.org/?a=commitdiff_plain;h=e25ccd56bc26214dab1ad640db443ca95cd5a5e3;p=next-scripts

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

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