Re: [PATCH 3/7] Documentation: git-init: template directory: reword
On Wed, Aug 06, 2014 at 10:21:33AM -0700, Junio C Hamano wrote: Linus Arver linusar...@gmail.com writes: No, the unindenting/removal of blank lines is a non-grammar change and is not necessary, as it doesn't have any effect on the actual output (html/txt/manpage). I can either keep the same coding style with the rewording, or chop this into two commits, one for the rewording and another for reformatting. Which one do you suggest? If I were doing this change, I wouldn't touch the formatting, because I did not find that the reformatted version would be any easier to read or maintain compared to the original. But I suspect that you must have thought the reformatting was a good thing to do for a reason, and I suspected I might have been missing something obvious to you, and that was why I asked. If there is a good reason to reformat, then lets hear it in the commit log message of one of the two patches. Otherwise we can drop the reformatting part. And well, considering that the rewording makes the separate items into a single sentence, I thought it would help readability to delete all the whitespace. In retrospect, I don't think this is a good enough reason to reformat. It was more of a personal writing style judgment call. I am dropping the reformatting part. -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 3/7] Documentation: git-init: template directory: reword
Linus Arver linusar...@gmail.com writes: No, the unindenting/removal of blank lines is a non-grammar change and is not necessary, as it doesn't have any effect on the actual output (html/txt/manpage). I can either keep the same coding style with the rewording, or chop this into two commits, one for the rewording and another for reformatting. Which one do you suggest? If I were doing this change, I wouldn't touch the formatting, because I did not find that the reformatted version would be any easier to read or maintain compared to the original. But I suspect that you must have thought the reformatting was a good thing to do for a reason, and I suspected I might have been missing something obvious to you, and that was why I asked. If there is a good reason to reformat, then lets hear it in the commit log message of one of the two patches. Otherwise we can drop the reformatting part. So my suggestion would be a patch #1 to reword, and optionally another patch #2 to reformat on top, if (and only if) there is a good reason to reformat. -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 3/7] Documentation: git-init: template directory: reword
Linus Arver linusar...@gmail.com writes: Signed-off-by: Linus Arver linusar...@gmail.com --- This seems to reword and also reformat at the same time, but was the latter change (i.e. to unindent the bulletted items and to remove blank lines between items) necessary? Documentation/git-init.txt | 14 +- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/Documentation/git-init.txt b/Documentation/git-init.txt index 45501d0..f21b85b 100644 --- a/Documentation/git-init.txt +++ b/Documentation/git-init.txt @@ -113,22 +113,18 @@ line, the command is run inside the directory (possibly after creating it). -- - TEMPLATE DIRECTORY -- The template directory contains files and directories that will be copied to the `$GIT_DIR` after it is created. -The template directory used will be (in order): - - - The argument given with the `--template` option. - - - The contents of the `$GIT_TEMPLATE_DIR` environment variable. - - - The `init.templatedir` configuration variable. +The template directory will be one of the following (in order): - - The default template directory: `/usr/share/git-core/templates`. +- the argument given with the `--template` option; +- the contents of the `$GIT_TEMPLATE_DIR` environment variable; +- the `init.templatedir` configuration variable; or +- the default template directory: `/usr/share/git-core/templates`. The default template directory includes some directory structure, some suggested exclude patterns, and copies of sample hook files. -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 3/7] Documentation: git-init: template directory: reword
On Tue, Aug 05, 2014 at 03:10:30PM -0700, Junio C Hamano wrote: Linus Arver linusar...@gmail.com writes: Signed-off-by: Linus Arver linusar...@gmail.com --- This seems to reword and also reformat at the same time, but was the latter change (i.e. to unindent the bulletted items and to remove blank lines between items) necessary? No, the unindenting/removal of blank lines is a non-grammar change and is not necessary, as it doesn't have any effect on the actual output (html/txt/manpage). I can either keep the same coding style with the rewording, or chop this into two commits, one for the rewording and another for reformatting. Which one do you suggest? Documentation/git-init.txt | 14 +- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/Documentation/git-init.txt b/Documentation/git-init.txt index 45501d0..f21b85b 100644 --- a/Documentation/git-init.txt +++ b/Documentation/git-init.txt @@ -113,22 +113,18 @@ line, the command is run inside the directory (possibly after creating it). -- - TEMPLATE DIRECTORY -- The template directory contains files and directories that will be copied to the `$GIT_DIR` after it is created. -The template directory used will be (in order): - - - The argument given with the `--template` option. - - - The contents of the `$GIT_TEMPLATE_DIR` environment variable. - - - The `init.templatedir` configuration variable. +The template directory will be one of the following (in order): - - The default template directory: `/usr/share/git-core/templates`. +- the argument given with the `--template` option; +- the contents of the `$GIT_TEMPLATE_DIR` environment variable; +- the `init.templatedir` configuration variable; or +- the default template directory: `/usr/share/git-core/templates`. The default template directory includes some directory structure, some suggested exclude patterns, and copies of sample hook files. -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
