From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 497B0138CBD for ; Tue, 10 Mar 2015 17:53:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C6905E0879; Tue, 10 Mar 2015 17:53:19 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 69996E0879 for ; Tue, 10 Mar 2015 17:53:19 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1B2B2340ABA for ; Tue, 10 Mar 2015 17:53:18 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C21FB13776 for ; Tue, 10 Mar 2015 17:53:13 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1426009910.ff3c131aeee6f053a6f9a706c1f1be279696c957.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: cnf/ X-VCS-Repository: proj/portage X-VCS-Files: cnf/dispatch-conf.conf X-VCS-Directories: cnf/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: ff3c131aeee6f053a6f9a706c1f1be279696c957 X-VCS-Branch: master Date: Tue, 10 Mar 2015 17:53:13 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 3b7e9d9f-16af-4ad7-90ab-c7db0251ac25 X-Archives-Hash: c8c4627877bcd2124f58190fd7f80c6b commit: ff3c131aeee6f053a6f9a706c1f1be279696c957 Author: Marc Schiffbauer gentoo org> AuthorDate: Tue Mar 10 16:23:52 2015 +0000 Commit: Zac Medico gentoo org> CommitDate: Tue Mar 10 17:51:50 2015 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=ff3c131a dispatch-conf.conf: less-opts --quit-if-one-screen for bug 501886 Use --quit-if-one-screen instead of --QUIT-AT-EOF, so that less doesn't quit automatically when the user has scrolled to the bottom. X-Gentoo-Bug: 501886 X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=501886 Signed-off-by: Zac Medico gentoo.org> Acked-by: Brian Dolbec gentoo.org> cnf/dispatch-conf.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cnf/dispatch-conf.conf b/cnf/dispatch-conf.conf index 125b7cc..7efce8a 100644 --- a/cnf/dispatch-conf.conf +++ b/cnf/dispatch-conf.conf @@ -31,7 +31,7 @@ diff="diff -Nu '%s' '%s'" pager="" # Default options used if less is the pager -less-opts="--no-init --QUIT-AT-EOF" +less-opts="--no-init --quit-if-one-screen" # Diff for interactive merges. # %s output file