From 3af36c6a4e93d4446ab9cc3b01aa26c0ff7b3468 Mon Sep 17 00:00:00 2001
From: Jakub Vrana <jakub@vrana.cz>
Date: Sat, 6 Apr 2013 09:23:41 -0700
Subject: [PATCH] Hide Git merge stats in arc land

Test Plan:
  $ arc land # in Git repo

Reviewers: epriestley

Reviewed By: epriestley

CC: aran, Korvin

Differential Revision: https://secure.phabricator.com/D5599
---
 src/workflow/ArcanistLandWorkflow.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/workflow/ArcanistLandWorkflow.php b/src/workflow/ArcanistLandWorkflow.php
index 7fdb23ee..65b37c02 100644
--- a/src/workflow/ArcanistLandWorkflow.php
+++ b/src/workflow/ArcanistLandWorkflow.php
@@ -584,7 +584,7 @@ EOTEXT
         }
       } else {
         $err = phutil_passthru(
-          'git merge %s -m %s',
+          'git merge --no-stat %s -m %s',
           $this->onto,
           "Automatic merge by 'arc land'");
         if ($err) {
@@ -630,7 +630,7 @@ EOTEXT
     if ($this->isGit) {
       $repository_api->execxLocal('checkout %s', $this->onto);
       $repository_api->execxLocal(
-        'merge --squash --ff-only %s',
+        'merge --no-stat --squash --ff-only %s',
         $this->branch);
     } else if ($this->isHg) {
       // The hg code is a little more complex than git's because we
@@ -801,7 +801,7 @@ EOTEXT
     chdir($repository_api->getPath());
     if ($this->isGit) {
       $err = phutil_passthru(
-        'git merge --no-ff --no-commit %s',
+        'git merge --no-stat --no-ff --no-commit %s',
         $this->branch);
 
       if ($err) {