From mboxrd@z Thu Jan 1 00:00:00 1970 From: Pete Wyckoff Subject: [PATCH 11/11] git p4 doc: use two-line style for options with multiple spellings Date: Tue, 21 Jan 2014 18:16:48 -0500 Message-ID: <1390346208-9207-12-git-send-email-pw@padd.com> References: <1390346208-9207-1-git-send-email-pw@padd.com> Cc: Junio C Hamano To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Wed Jan 22 00:20:40 2014 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1W5kcY-0002bR-QR for gcvg-git-2@plane.gmane.org; Wed, 22 Jan 2014 00:20:39 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754158AbaAUXUf (ORCPT ); Tue, 21 Jan 2014 18:20:35 -0500 Received: from honk.padd.com ([74.3.171.149]:36969 "EHLO honk.padd.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752698AbaAUXUc (ORCPT ); Tue, 21 Jan 2014 18:20:32 -0500 Received: from arf.padd.com (unknown [50.105.0.78]) by honk.padd.com (Postfix) with ESMTPSA id 5E4497112; Tue, 21 Jan 2014 15:20:31 -0800 (PST) Received: by arf.padd.com (Postfix, from userid 7770) id D28CD200F7; Tue, 21 Jan 2014 18:20:28 -0500 (EST) X-Mailer: git-send-email 1.8.5.2.364.g6ac45cd In-Reply-To: <1390346208-9207-1-git-send-email-pw@padd.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Thomas Rast noticed the docs have a mix of styles when it comes to options with multiple spellings. Standardize the couple in git-p4.txt that are odd. Instead of: -n, --dry-run:: Do this: -n:: --dry-run:: See http://thread.gmane.org/gmane.comp.version-control.git/219936/focus=219945 Signed-off-by: Pete Wyckoff --- Documentation/git-p4.txt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Documentation/git-p4.txt b/Documentation/git-p4.txt index 8cba16d..6ab5f94 100644 --- a/Documentation/git-p4.txt +++ b/Documentation/git-p4.txt @@ -168,7 +168,8 @@ All commands except clone accept these options. --git-dir :: Set the 'GIT_DIR' environment variable. See linkgit:git[1]. ---verbose, -v:: +-v:: +--verbose:: Provide more progress information. Sync options @@ -279,7 +280,8 @@ These options can be used to modify 'git p4 submit' behavior. Export tags from Git as p4 labels. Tags found in Git are applied to the perforce working directory. ---dry-run, -n:: +-n:: +--dry-run:: Show just what commits would be submitted to p4; do not change state in Git or p4. -- 1.8.5.2.320.g99957e5