{"thread":{"id":"30447","subject":"[PATCH master] git p4 doc: fix formatting","startedAt":"2012-05-06T15:56:50Z","lastAt":"2012-05-07T18:14:27Z","messageCount":3,"participants":["Pete Wyckoff","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"190925","messageId":"20120506155650.GA12106@padd.com","threadId":"30447","inReplyTo":null,"subject":"[PATCH master] git p4 doc: fix formatting","fromName":"Pete Wyckoff","fromEmail":"pw@padd.com","sentAt":"2012-05-06T15:56:50Z","receivedAt":"2012-05-06T15:56:50Z","isPatch":true,"sender":{"key":"pw@padd.com","avatar":null},"body":"Attach example sections to previous level of indenting.\n\nFix a trailing ::\n\nSigned-off-by: Pete Wyckoff <pw@padd.com>\n---\n\nThe nice git-scm.com redo made me proofread this doc.\n\nPatch on origin/master.\n\nEven though this looks like a job for maint, both hunks\nwill collide there.  maint version follows.\n\n\t\t-- Pete\n\n Documentation/git-p4.txt | 5 +++--\n 1 file changed, 3 insertions(+), 2 deletions(-)\n\ndiff --git a/Documentation/git-p4.txt b/Documentation/git-p4.txt\nindex 51955a5..fe1f49b 100644\n--- a/Documentation/git-p4.txt\n+++ b/Documentation/git-p4.txt\n@@ -179,6 +179,7 @@ subsequent 'sync' operations.\n +\n This example imports a new remote \"p4/proj2\" into an existing\n git repository:\n++\n ----\n     $ git init\n     $ git p4 sync --branch=refs/remotes/p4/proj2 //depot/proj2\n@@ -438,7 +439,7 @@ git-p4.branchList::\n \tenabled.  Each entry should be a pair of branch names separated\n \tby a colon (:).  This example declares that both branchA and\n \tbranchB were created from main:\n-\n++\n -------------\n git config       git-p4.branchList main:branchA\n git config --add git-p4.branchList main:branchB\n@@ -503,7 +504,7 @@ git-p4.skipUserNameCheck::\n \tuser map, 'git p4' exits.  This option can be used to force\n \tsubmission regardless.\n \n-git-p4.attemptRCSCleanup:\n+git-p4.attemptRCSCleanup::\n \tIf enabled, 'git p4 submit' will attempt to cleanup RCS keywords\n \t($Header$, etc). These would otherwise cause merge conflicts and prevent\n \tthe submit going ahead. This option should be considered experimental at\n-- \n1.7.10.1.510.g2648e0e\n"},{"id":"190926","messageId":"20120506155838.GB12106@padd.com","threadId":"30447","inReplyTo":"20120506155650.GA12106@padd.com","subject":"[PATCH maint] git p4 doc: fix formatting","fromName":"Pete Wyckoff","fromEmail":"pw@padd.com","sentAt":"2012-05-06T15:58:38Z","receivedAt":"2012-05-06T15:58:38Z","isPatch":true,"sender":{"key":"pw@padd.com","avatar":null},"body":"Attach example sections to previous level of indenting.\n\nFix a trailing ::\n\nSigned-off-by: Pete Wyckoff <pw@padd.com>\n---\n\nThis one goes on maint, but will collide on both hunks\nwhen merged to master.\n\n Documentation/git-p4.txt | 4 +++-\n 1 file changed, 3 insertions(+), 1 deletion(-)\n\ndiff --git a/Documentation/git-p4.txt b/Documentation/git-p4.txt\nindex b7c7929..cf3a9fd 100644\n--- a/Documentation/git-p4.txt\n+++ b/Documentation/git-p4.txt\n@@ -183,6 +183,7 @@ subsequent 'sync' operations.\n +\n This example imports a new remote \"p4/proj2\" into an existing\n git repository:\n++\n ----\n     $ git init\n     $ git p4 sync --branch=refs/remotes/p4/proj2 //depot/proj2\n@@ -434,6 +435,7 @@ git-p4.branchList::\n \tenabled.  Each entry should be a pair of branch names separated\n \tby a colon (:).  This example declares that both branchA and\n \tbranchB were created from main:\n++\n -------------\n git config       git-p4.branchList main:branchA\n git config --add git-p4.branchList main:branchB\n@@ -487,7 +489,7 @@ git-p4.skipUserNameCheck::\n \tuser map, 'git p4' exits.  This option can be used to force\n \tsubmission regardless.\n \n-git-p4.attemptRCSCleanup:\n+git-p4.attemptRCSCleanup::\n     If enabled, 'git p4 submit' will attempt to cleanup RCS keywords\n     ($Header$, etc). These would otherwise cause merge conflicts and prevent\n     the submit going ahead. This option should be considered experimental at\n-- \n1.7.10.1.510.g2648e0e\n"},{"id":"191019","messageId":"7vk40n6epo.fsf@alter.siamese.dyndns.org","threadId":"30447","inReplyTo":"20120506155650.GA12106@padd.com","subject":"Re: [PATCH master] git p4 doc: fix formatting","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2012-05-07T18:14:27Z","receivedAt":"2012-05-07T18:14:27Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Pete Wyckoff <pw@padd.com> writes:\n\n> Attach example sections to previous level of indenting.\n>\n> Fix a trailing ::\n>\n> Signed-off-by: Pete Wyckoff <pw@padd.com>\n> ---\n>\n> The nice git-scm.com redo made me proofread this doc.\n>\n> Patch on origin/master.\n>\n> Even though this looks like a job for maint, both hunks\n> will collide there.  maint version follows.\n\nWill apply the 'maint' one and merge it up to 'master', and will use this\nas a reference to avoid mismerges.\n\nThanks.\n"}]}