diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2018-01-16 11:24:43 -0500 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2018-01-16 11:24:43 -0500 |
| commit | c63938c5e093ed690ef1a96ea463396a3ac90ada (patch) | |
| tree | e8c9692faded2afc6afebdf2b0db9d827aebe3a0 /tools/catalyst-auto | |
| parent | catalyst-auto: update arch configs after timestamp changes (diff) | |
| download | releng-c63938c5e093ed690ef1a96ea463396a3ac90ada.tar.gz releng-c63938c5e093ed690ef1a96ea463396a3ac90ada.tar.bz2 releng-c63938c5e093ed690ef1a96ea463396a3ac90ada.zip | |
catalyst-auto: run git merge in quiet mode
Diffstat (limited to 'tools/catalyst-auto')
| -rwxr-xr-x | tools/catalyst-auto | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/catalyst-auto b/tools/catalyst-auto index b7036937..6aac1cc4 100755 --- a/tools/catalyst-auto +++ b/tools/catalyst-auto @@ -203,7 +203,7 @@ git_update() { repo_dir=$1 script=$2 shift 2 pushd "${repo_dir}" >/dev/null - git merge FETCH_HEAD || echo "${script}: WARNING: git repo is dirty" + git merge -q FETCH_HEAD || echo "${script}: WARNING: git repo is dirty" popd >/dev/null exec "${script}" "$@" ' -- "${REPO_DIR}" "$0" "$@" |