diff options
| author | Dan Loewenherz <daniel.loewenherz@yale.edu> | 2009-04-22 21:46:02 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-04-22 19:05:37 -0700 |
| commit | 7bd93c1c625ce5fa03f0d13d728f34f8ab868991 (patch) | |
| tree | 5e931912f8778ca8d6115347034041eaa9dc0964 /git-merge-resolve.sh | |
| parent | b18cc5a3b2f64364d2c7d3560066852728a6c666 (diff) | |
| download | git-7bd93c1c625ce5fa03f0d13d728f34f8ab868991.tar.gz | |
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 <daniel.loewenherz@yale.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge-resolve.sh')
| -rwxr-xr-x | git-merge-resolve.sh | 4 |
1 files changed, 2 insertions, 2 deletions
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 |