{"thread":{"id":"46407","subject":"[PATCH] doc: reformat the paragraph containing the 'cut-line'","startedAt":"2017-07-17T15:38:35Z","lastAt":"2017-07-18T14:34:29Z","messageCount":4,"participants":["Kaartic Sivaraam","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"324644","messageId":"20170717153839.16586-1-kaarticsivaraam91196@gmail.com","threadId":"46407","inReplyTo":null,"subject":"[PATCH] doc: reformat the paragraph containing the 'cut-line'","fromName":"Kaartic Sivaraam","fromEmail":"kaarticsivaraam91196@gmail.com","sentAt":"2017-07-17T15:38:39Z","receivedAt":"2017-07-17T15:38:35Z","isPatch":true,"sender":{"key":"kaartic.sivaraam@gmail.com","avatar":"https://avatars.githubusercontent.com/u/12448084?v=4"},"body":"The paragraph that describes the 'scissors' cleanup mode of\n'commit' had the 'cut-line' in the middle of a sentence. This\nmade it possible for the line to get wrapped on smaler windows.\nThis shouldn't be the case as it makes it hard for the user to\nunderstand the structure of the cut-line.\n\nReformat the pragraph to make the 'cut-line' stand on a line of\nit's own thus distinguishing it from the rest of the paragraph.\nThis further prevents it from getting wrapped to some extent.\n\nSigned-off-by: Kaartic Sivaraam \n---\n Documentation/git-commit.txt | 11 ++++++-----\n 1 file changed, 6 insertions(+), 5 deletions(-)\n\ndiff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt\nindex afb06adba..2c0d48bab 100644\n--- a/Documentation/git-commit.txt\n+++ b/Documentation/git-commit.txt\n@@ -196,11 +196,12 @@ whitespace::\n verbatim::\n \tDo not change the message at all.\n scissors::\n-\tSame as `whitespace`, except that everything from (and\n-\tincluding) the line\n-\t\"`# ------------------------ >8 ------------------------`\"\n-\tis truncated if the message is to be edited. \"`#`\" can be\n-\tcustomized with core.commentChar.\n+\tSame as `whitespace` except that everything from (and including)\n+ the line found below is truncated, if the message is to be edited.\n+ \"`#`\" can be customized with core.commentChar.\n+\n+ # ------------------------ >8 ------------------------\n+\n default::\n \tSame as `strip` if the message is to be edited.\n \tOtherwise `whitespace`.\n-- \n2.13.3.973.gaaf39e6bd.dirty\n\n"},{"id":"324690","messageId":"xmqqefteg155.fsf@gitster.mtv.corp.google.com","threadId":"46407","inReplyTo":"20170717153839.16586-1-kaarticsivaraam91196@gmail.com","subject":"Re: [PATCH] doc: reformat the paragraph containing the 'cut-line'","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2017-07-17T22:16:22Z","receivedAt":"2017-07-17T22:16:28Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Kaartic Sivaraam writes:\n\n> The paragraph that describes the 'scissors' cleanup mode of\n> 'commit' had the 'cut-line' in the middle of a sentence. This\n> made it possible for the line to get wrapped on smaler windows.\n> This shouldn't be the case as it makes it hard for the user to\n> understand the structure of the cut-line.\n>\n> Reformat the pragraph to make the 'cut-line' stand on a line of\n> it's own thus distinguishing it from the rest of the paragraph.\n> This further prevents it from getting wrapped to some extent.\n>\n> Signed-off-by: Kaartic Sivaraam \n> ---\n> Documentation/git-commit.txt | 11 ++++++-----\n> 1 file changed, 6 insertions(+), 5 deletions(-)\n>\n> diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt\n> index afb06adba..2c0d48bab 100644\n> --- a/Documentation/git-commit.txt\n> +++ b/Documentation/git-commit.txt\n> @@ -196,11 +196,12 @@ whitespace::\n> verbatim::\n> \tDo not change the message at all.\n> scissors::\n> -\tSame as `whitespace`, except that everything from (and\n> -\tincluding) the line\n> -\t\"`# ------------------------ >8 ------------------------`\"\n> -\tis truncated if the message is to be edited. \"`#`\" can be\n> -\tcustomized with core.commentChar.\n> +\tSame as `whitespace` except that everything from (and including)\n> + the line found below is truncated, if the message is to be edited.\n> + \"`#`\" can be customized with core.commentChar.\n\nIs there some funny indentation setting involved? Why aren't these\nlines aligning?\n\n> +\n> + # ------------------------ >8 ------------------------\n> +\n\nDoes an empty line before this one screw up the asciidoc formatting?\n\nIf the long line is problematic, I think it is safer to perhaps\nspell it out, perhaps something like\n\n\t... except that everything is ignored down from the\n\t\"scissors\" line that begins with a core.commentChar (`#` by\n\tdefault) followed by many dashes `-`, followed by the\n\tscissors mark ` >8 `, followed by many dashes `-`.\n\n???\n\n> default::\n> \tSame as `strip` if the message is to be edited.\n> \tOtherwise `whitespace`.\n"},{"id":"324701","messageId":"1500388168.2065.2.camel@gmail.com","threadId":"46407","inReplyTo":"xmqqefteg155.fsf@gitster.mtv.corp.google.com","subject":"Re: [PATCH] doc: reformat the paragraph containing the 'cut-line'","fromName":"Kaartic Sivaraam","fromEmail":"kaarticsivaraam91196@gmail.com","sentAt":"2017-07-18T14:29:28Z","receivedAt":"2017-07-18T14:29:37Z","isPatch":true,"sender":{"key":"kaartic.sivaraam@gmail.com","avatar":"https://avatars.githubusercontent.com/u/12448084?v=4"},"body":"On Mon, 2017-07-17 at 15:16 -0700, Junio C Hamano wrote:\n> Kaartic Sivaraam writes:\n> > +\tSame as `whitespace` except that everything from (and including)\n> > + the line found below is truncated, if the message is to be edited.\n> > + \"`#`\" can be customized with core.commentChar.\n> \n> Is there some funny indentation setting involved? Why aren't these\n> lines aligning? \n> \nYep, there was an indentation issue that I have fixed now.\n\n> > +\n> > + # ------------------------ >8 ------------------------\n> > +\n> \n> \n> Does an empty line before this one screw up the asciidoc formatting?\n> \nI think *no*. I build the docs with the change and didn't find anything\nodd. \n\n> If the long line is problematic, I think it is safer to perhaps\n> spell it out, perhaps something like\n> \n> \t... except that everything is ignored down from the\n> \t\"scissors\" line that begins with a core.commentChar (`#` by\n> \tdefault) followed by many dashes `-`, followed by the\n> \tscissors mark ` >8 `, followed by many dashes `-`.\n> \n> ???\n> \nI think it's better to keep the line as it is, considering the famous\ncliché, \"a picture is worth a thousand words\" and combining it with the\nfact that \"humans looks for patterns in everything\".\n\nSpelling the line out would make it hard to get a *picture* of what's\ntrying to be described.\n\n-- \nKaartic\n"},{"id":"324702","messageId":"20170718143427.3780-1-kaarticsivaraam91196@gmail.com","threadId":"46407","inReplyTo":"1500388168.2065.2.camel@gmail.com","subject":"[PATCH] doc: reformat the paragraph containing the 'cut-line'","fromName":"Kaartic Sivaraam","fromEmail":"kaarticsivaraam91196@gmail.com","sentAt":"2017-07-18T14:34:27Z","receivedAt":"2017-07-18T14:34:29Z","isPatch":true,"sender":{"key":"kaartic.sivaraam@gmail.com","avatar":"https://avatars.githubusercontent.com/u/12448084?v=4"},"body":"The paragraph that describes the 'scissors' cleanup mode of\n'commit' had the 'cut-line' in the middle of a sentence. This\nmade it possible for the line to get wrapped on smaler windows.\nThis shouldn't be the case as it makes it hard for the user to\nunderstand the structure of the cut-line.\n\nReformat the pragraph to make the 'cut-line' stand on a line of\nit's own thus distinguishing it from the rest of the paragraph.\nThis further prevents it from getting wrapped to some extent.\n\nSigned-off-by: Kaartic Sivaraam \n---\n Documentation/git-commit.txt | 11 ++++++-----\n 1 file changed, 6 insertions(+), 5 deletions(-)\n\ndiff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt\nindex afb06adba..8c74a2ca0 100644\n--- a/Documentation/git-commit.txt\n+++ b/Documentation/git-commit.txt\n@@ -196,11 +196,12 @@ whitespace::\n verbatim::\n \tDo not change the message at all.\n scissors::\n-\tSame as `whitespace`, except that everything from (and\n-\tincluding) the line\n-\t\"`# ------------------------ >8 ------------------------`\"\n-\tis truncated if the message is to be edited. \"`#`\" can be\n-\tcustomized with core.commentChar.\n+\tSame as `whitespace` except that everything from (and including)\n+\tthe line found below is truncated, if the message is to be edited.\n+\t\"`#`\" can be customized with core.commentChar.\n+\n+\t\t# ------------------------ >8 ------------------------\n+\n default::\n \tSame as `strip` if the message is to be edited.\n \tOtherwise `whitespace`.\n-- \n2.13.3.973.gaaf39e6bd.dirty\n\n"}]}