From: Pete Wyckoff <pw@padd.com>
To: git@vger.kernel.org
Subject: [PATCH master] git p4 doc: fix formatting
Date: Sun, 6 May 2012 11:56:50 -0400 [thread overview]
Message-ID: <20120506155650.GA12106@padd.com> (raw)
Attach example sections to previous level of indenting.
Fix a trailing ::
Signed-off-by: Pete Wyckoff <pw@padd.com>
---
The nice git-scm.com redo made me proofread this doc.
Patch on origin/master.
Even though this looks like a job for maint, both hunks
will collide there. maint version follows.
-- Pete
Documentation/git-p4.txt | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/Documentation/git-p4.txt b/Documentation/git-p4.txt
index 51955a5..fe1f49b 100644
--- a/Documentation/git-p4.txt
+++ b/Documentation/git-p4.txt
@@ -179,6 +179,7 @@ subsequent 'sync' operations.
+
This example imports a new remote "p4/proj2" into an existing
git repository:
++
----
$ git init
$ git p4 sync --branch=refs/remotes/p4/proj2 //depot/proj2
@@ -438,7 +439,7 @@ git-p4.branchList::
enabled. Each entry should be a pair of branch names separated
by a colon (:). This example declares that both branchA and
branchB were created from main:
-
++
-------------
git config git-p4.branchList main:branchA
git config --add git-p4.branchList main:branchB
@@ -503,7 +504,7 @@ git-p4.skipUserNameCheck::
user map, 'git p4' exits. This option can be used to force
submission regardless.
-git-p4.attemptRCSCleanup:
+git-p4.attemptRCSCleanup::
If enabled, 'git p4 submit' will attempt to cleanup RCS keywords
($Header$, etc). These would otherwise cause merge conflicts and prevent
the submit going ahead. This option should be considered experimental at
--
1.7.10.1.510.g2648e0e
next reply other threads:[~2012-05-06 15:56 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-06 15:56 Pete Wyckoff [this message]
2012-05-06 15:58 ` [PATCH maint] git p4 doc: fix formatting Pete Wyckoff
2012-05-07 18:14 ` [PATCH master] " Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20120506155650.GA12106@padd.com \
--to=pw@padd.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).