From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pa0-f48.google.com ([209.85.220.48]:52148 "EHLO mail-pa0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933245AbaLKUwv (ORCPT ); Thu, 11 Dec 2014 15:52:51 -0500 Received: by mail-pa0-f48.google.com with SMTP id rd3so5765938pab.21 for ; Thu, 11 Dec 2014 12:52:50 -0800 (PST) From: Olof Johansson Subject: [PATCH 2/2] merge_config.sh: add -? for help Date: Thu, 11 Dec 2014 12:55:04 -0800 Message-Id: <1418331304-4821-2-git-send-email-olof@lixom.net> In-Reply-To: <1418331304-4821-1-git-send-email-olof@lixom.net> References: <1418331304-4821-1-git-send-email-olof@lixom.net> Sender: linux-kbuild-owner@vger.kernel.org List-ID: To: yann.morin.1998@free.fr Cc: linux-kbuild@vger.kernel.org, dvhart@linux.intel.com, linux-kernel@vger.kernel.org, Olof Johansson It's usual enough for help text that it makes sense to support it. Signed-off-by: Olof Johansson --- scripts/kconfig/merge_config.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/kconfig/merge_config.sh b/scripts/kconfig/merge_config.sh index 2ab91b9..0c89537 100755 --- a/scripts/kconfig/merge_config.sh +++ b/scripts/kconfig/merge_config.sh @@ -28,11 +28,11 @@ trap clean_up HUP INT TERM usage() { echo "Usage: $0 [OPTIONS] [CONFIG [...]]" - echo " -h display this help text" - echo " -m only merge the fragments, do not execute the make command" - echo " -n use allnoconfig instead of alldefconfig" - echo " -r list redundant entries when merging fragments" - echo " -O dir to put generated output files" + echo " -h or -? display this help text" + echo " -m only merge the fragments, do not execute the make command" + echo " -n use allnoconfig instead of alldefconfig" + echo " -r list redundant entries when merging fragments" + echo " -O dir to put generated output files" } MAKE=true @@ -52,7 +52,7 @@ while true; do shift continue ;; - "-h") + "-h"|"-?") usage exit ;; -- 1.7.10.4