From 7bd93c1c625ce5fa03f0d13d728f34f8ab868991 Mon Sep 17 00:00:00 2001 From: Dan Loewenherz Date: Wed, 22 Apr 2009 21:46:02 -0400 Subject: Convert to use quiet option when available A minor fix that eliminates usage of "2>/dev/null" when --quiet or -q has already been implemented. Signed-off-by: Dan Loewenherz Signed-off-by: Junio C Hamano --- git-merge-resolve.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'git-merge-resolve.sh') diff --git a/git-merge-resolve.sh b/git-merge-resolve.sh index 93bcfc2f5d..c9da747fcf 100755 --- a/git-merge-resolve.sh +++ b/git-merge-resolve.sh @@ -37,10 +37,10 @@ then exit 2 fi -git update-index --refresh 2>/dev/null +git update-index -q --refresh git read-tree -u -m --aggressive $bases $head $remotes || exit 2 echo "Trying simple merge." -if result_tree=$(git write-tree 2>/dev/null) +if result_tree=$(git write-tree 2>/dev/null) then exit 0 else -- cgit v1.2.3