From mboxrd@z Thu Jan 1 00:00:00 1970 From: Theodore Tso Subject: [PATCH, UPDATED] Fix formatting for urls section of fetch, pull, and push manpages Date: Sat, 30 Dec 2006 23:11:52 -0500 Message-ID: <20061231041152.GA791@thunk.org> References: Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-From: git-owner@vger.kernel.org Sun Dec 31 13:37:11 2006 Return-path: Envelope-to: gcvg-git@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1H0zvz-0007xH-8G for gcvg-git@gmane.org; Sun, 31 Dec 2006 13:37:03 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933157AbWLaMg7 (ORCPT ); Sun, 31 Dec 2006 07:36:59 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S933159AbWLaMg7 (ORCPT ); Sun, 31 Dec 2006 07:36:59 -0500 Received: from thunk.org ([69.25.196.29]:55120 "EHLO thunker.thunk.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933157AbWLaMg6 (ORCPT ); Sun, 31 Dec 2006 07:36:58 -0500 Received: from root (helo=candygram.thunk.org) by thunker.thunk.org with local-esmtps (tls_cipher TLS-1.0:RSA_AES_256_CBC_SHA:32) (Exim 4.50 #1 (Debian)) id 1H100D-0001pL-3b; Sun, 31 Dec 2006 07:41:25 -0500 Received: from tytso by candygram.thunk.org with local (Exim 4.62) (envelope-from ) id 1H0s36-0001AB-Fe; Sat, 30 Dec 2006 23:11:52 -0500 To: git@vger.kernel.org Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.12-2006-07-14 X-SA-Exim-Connect-IP: X-SA-Exim-Mail-From: tytso@thunk.org X-SA-Exim-Scanned: No (on thunker.thunk.org); SAEximRunCond expanded to false Sender: git-owner@vger.kernel.org Precedence: bulk X-Mailing-List: git@vger.kernel.org Archived-At: The line: [remote ""] was getting swallowed up by asciidoc, causing a critical line in the explanation for how to store the .git/remotes information in .git/config to go missing from the git-fetch, git-pull, and git-push manpages. Put all of the examples into delimited blocks to fix this problem and to make them look nicer. Signed-off-by: "Theodore Ts'o" [Updated to make thee nroff'ed man pages look nicer] --- Documentation/urls.txt | 19 +++++++++++++++---- 1 files changed, 15 insertions(+), 4 deletions(-) diff --git a/Documentation/urls.txt b/Documentation/urls.txt index 670827c..745f967 100644 --- a/Documentation/urls.txt +++ b/Documentation/urls.txt @@ -40,10 +40,13 @@ In addition to the above, as a short-hand, the name of a file in `$GIT_DIR/remotes` directory can be given; the named file should be in the following format: +------------ URL: one of the above URL format Push: Pull: +------------ + Then such a short-hand is specified in place of without parameters on the command line, specified on `Push:` lines or `Pull:` @@ -54,10 +57,13 @@ be specified for additional branch mappings. Or, equivalently, in the `$GIT_DIR/config` (note the use of `fetch` instead of `Pull:`): -[remote ""] - url = - push = - fetch = +------------ + [remote ""] + url = + push = + fetch = + +------------ The name of a file in `$GIT_DIR/branches` directory can be specified as an older notation short-hand; the named @@ -68,10 +74,15 @@ name of remote head (URL fragment notation). without the fragment is equivalent to have this in the corresponding file in the `$GIT_DIR/remotes/` directory. +------------ URL: Pull: refs/heads/master: +------------ + while having `#` is equivalent to +------------ URL: Pull: refs/heads/: +------------ -- 1.5.0.rc0.g1d42