# [PATCH master] git p4 doc: fix formatting 3 messages from 2012-05-06 to 2012-05-07. Participants: Pete Wyckoff, Junio C Hamano. Thread: https://gitlist.dev/t/30447 ## Pete Wyckoff, 2012-05-06 15:56 Subject: [PATCH master] git p4 doc: fix formatting Message-ID: <20120506155650.GA12106@padd.com> URL: https://gitlist.dev/e/20120506155650.GA12106%40padd.com ``` Attach example sections to previous level of indenting. Fix a trailing :: Signed-off-by: Pete Wyckoff --- 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 ``` ## Pete Wyckoff, 2012-05-06 15:58 Subject: [PATCH maint] git p4 doc: fix formatting Message-ID: <20120506155838.GB12106@padd.com> URL: https://gitlist.dev/e/20120506155838.GB12106%40padd.com In-Reply-To: <20120506155650.GA12106@padd.com> ``` Attach example sections to previous level of indenting. Fix a trailing :: Signed-off-by: Pete Wyckoff --- This one goes on maint, but will collide on both hunks when merged to master. Documentation/git-p4.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Documentation/git-p4.txt b/Documentation/git-p4.txt index b7c7929..cf3a9fd 100644 --- a/Documentation/git-p4.txt +++ b/Documentation/git-p4.txt @@ -183,6 +183,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 @@ -434,6 +435,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 @@ -487,7 +489,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 ``` ## Junio C Hamano, 2012-05-07 18:14 Subject: Re: [PATCH master] git p4 doc: fix formatting Message-ID: <7vk40n6epo.fsf@alter.siamese.dyndns.org> URL: https://gitlist.dev/e/7vk40n6epo.fsf%40alter.siamese.dyndns.org In-Reply-To: <20120506155650.GA12106@padd.com> ``` Pete Wyckoff writes: > Attach example sections to previous level of indenting. > > Fix a trailing :: > > Signed-off-by: Pete Wyckoff > --- > > 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. Will apply the 'maint' one and merge it up to 'master', and will use this as a reference to avoid mismerges. Thanks. ```