{"thread":{"id":"9014","subject":"[PATCH 2/3] Document long options '--message=' and '--no-commit'","startedAt":"2007-07-12T23:54:06Z","lastAt":"2007-07-12T23:54:08Z","messageCount":3,"participants":["Jakub Narebski"],"isPatch":true,"patchVersion":1,"patchTotal":3},"messages":[{"id":"47217","messageId":"11842844481113-git-send-email-jnareb@gmail.com","threadId":"9014","inReplyTo":null,"subject":"[PATCH 1/3] Document GIT_MERGE_VERBOSITY environmental variable","fromName":"Jakub Narebski","fromEmail":"jnareb@gmail.com","sentAt":"2007-07-12T23:54:06Z","receivedAt":"2007-07-12T23:54:06Z","isPatch":true,"sender":{"key":"jnareb@gmail.com","avatar":"https://avatars.githubusercontent.com/u/2706?v=4"},"body":"While at it, add \"Configuration\" section mentioning merge.summary\nconfiguration variable (which is mentioned in git-fmt-merge-msg(1)\nman page, but it is a plumbing command), and merge.verbosity\nconfiguration variable (so there is a place to make reference\nfrom \"Environment Variables\" section of git(7) man page) to the\ngit-merge(1) man page.\n\nThe configuration variable merge.verbosity and environmental variable\nGIT_MERGE_VERBOSITY were introduced in commit 8c3275ab, which also\ndocumented configuration variable but not environmental variable.\n\nSigned-off-by: Jakub Narebski \n---\nThe alternative to adding \"Configuration\" section to git-merge(1)\nman page, and referring to it in the description of GIT_MERGE_VERBOSITY\nenvironmental variable in git(7), would be to either refer to\ngit-config(1), or add full description similar to description of\nmerge.verbosity to git(7).\n\nPerhaps above paragraph should be added to commit message?\n\nI have put shortened sha1 of commit which introduced setting of\na merge verbosity to be able to go to it from graphical UI\nlike for example gitweb.\n\n Documentation/config.txt | 1 +\n Documentation/git-merge.txt | 15 +++++++++++++++\n Documentation/git.txt | 5 +++++\n 3 files changed, 21 insertions(+), 0 deletions(-)\n\ndiff --git a/Documentation/config.txt b/Documentation/config.txt\nindex 4b67f0a..6cd0ff0 100644\n--- a/Documentation/config.txt\n+++ b/Documentation/config.txt\n@@ -567,6 +567,7 @@ merge.verbosity::\n \tmessage if conflicts were detected. Level 1 outputs only\n \tconflicts, 2 outputs conflicts and file changes. Level 5 and\n \tabove outputs debugging information. The default is level 2.\n+\tCan be overriden by 'GIT_MERGE_VERBOSITY' environment variable.\n \n merge..name::\n \tDefines a human readable name for a custom low-level\ndiff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt\nindex d285cba..1442e06 100644\n--- a/Documentation/git-merge.txt\n+++ b/Documentation/git-merge.txt\n@@ -43,6 +43,21 @@ If you tried a merge which resulted in a complex conflicts and\n would want to start over, you can recover with\n gitlink:git-reset[1].\n \n+CONFIGURATION\n+-------------\n+\n+merge.summary::\n+ Whether to include summaries of merged commits in newly\n+ merge commit messages. False by default.\n+\n+merge.verbosity::\n+\tControls the amount of output shown by the recursive merge\n+\tstrategy. Level 0 outputs nothing except a final error\n+\tmessage if conflicts were detected. Level 1 outputs only\n+\tconflicts, 2 outputs conflicts and file changes. Level 5 and\n+\tabove outputs debugging information. The default is level 2.\n+\tCan be overriden by 'GIT_MERGE_VERBOSITY' environment variable.\n+\n \n HOW MERGE WORKS\n ---------------\ndiff --git a/Documentation/git.txt b/Documentation/git.txt\nindex 10c7bb3..895c25c 100644\n--- a/Documentation/git.txt\n+++ b/Documentation/git.txt\n@@ -410,6 +410,11 @@ parameter, .\n \n other\n ~~~~~\n+'GIT_MERGE_VERBOSITY'::\n+\tA number controlling the amount of output shown by\n+\tthe recursive merge strategy. Overrides merge.verbosity.\n+\tSee gitlink:git-merge[1]\n+\n 'GIT_PAGER'::\n \tThis environment variable overrides `$PAGER`.\n \n-- \n1.5.2.2\n"},{"id":"47215","messageId":"11842844531700-git-send-email-jnareb@gmail.com","threadId":"9014","inReplyTo":"11842844481113-git-send-email-jnareb@gmail.com","subject":"[PATCH 2/3] Document long options '--message=' and '--no-commit'","fromName":"Jakub Narebski","fromEmail":"jnareb@gmail.com","sentAt":"2007-07-12T23:54:07Z","receivedAt":"2007-07-12T23:54:07Z","isPatch":true,"sender":{"key":"jnareb@gmail.com","avatar":"https://avatars.githubusercontent.com/u/2706?v=4"},"body":"Document that '--message=' is long version of '-m ' in\ngit-commit, and that '--no-checkout' is long version of '-n' in\ngit-clone.\n\nSigned-off-by: Jakub Narebski \n---\nThis patch was silently skipped in the 11 patches long series\nof documenting undocumented long options\n \"[PATCH 00/11] Document missing options\"\n(or rather two patches which are concatenated into this one).\n\n Documentation/git-clone.txt | 1 +\n Documentation/git-commit.txt | 2 +-\n 2 files changed, 2 insertions(+), 1 deletions(-)\n\ndiff --git a/Documentation/git-clone.txt b/Documentation/git-clone.txt\nindex 2f39864..a0a10e3 100644\n--- a/Documentation/git-clone.txt\n+++ b/Documentation/git-clone.txt\n@@ -64,6 +64,7 @@ OPTIONS\n \tOperate quietly. This flag is passed to \"rsync\" and\n \t\"git-fetch-pack\" commands when given.\n \n+--no-checkout::\n -n::\n \tNo checkout of HEAD is performed after the clone is complete.\n \ndiff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt\nindex 53a7bb0..352a494 100644\n--- a/Documentation/git-commit.txt\n+++ b/Documentation/git-commit.txt\n@@ -71,7 +71,7 @@ OPTIONS\n \tOverride the author name used in the commit. Use\n \t`A U Thor ` format.\n \n--m ::\n+-m |--message=::\n \tUse the given as the commit message.\n \n -s|--signoff::\n-- \n1.5.2.2\n"},{"id":"47216","messageId":"11842844544017-git-send-email-jnareb@gmail.com","threadId":"9014","inReplyTo":"11842844481113-git-send-email-jnareb@gmail.com","subject":"[PATCH 3/3] Document git commit --untracked-files and --verbose","fromName":"Jakub Narebski","fromEmail":"jnareb@gmail.com","sentAt":"2007-07-12T23:54:08Z","receivedAt":"2007-07-12T23:54:08Z","isPatch":true,"sender":{"key":"jnareb@gmail.com","avatar":"https://avatars.githubusercontent.com/u/2706?v=4"},"body":"Documentation based on description of commit 443f8338 which added\n'-u'|'--untracked-files' option to git-status, and on git-runstatus(1)\nman page.\n\nNote that those options apply also to git-status.\n\nSigned-off-by: Jakub Narebski \n---\nJunio C Hamano wrote:\n> Jakub Narebski writes:\n> \n>> +-u|--untracked-files::\n>> + Show all untracked files, also those in uninteresting\n>> + directories.\n>> +\n>> +-v|--verbose::\n>> + Show the diff output between the HEAD commit and what\n>> + would be committed.\n>> +\n> \n> Thanks -- \"show\" sounds a bit funny, though, don't you think?\n\nIs this one, with a longer description of options, better?\nThe previous version of this patch got skipped...\n\n Documentation/git-commit.txt | 15 ++++++++++++++-\n 1 files changed, 14 insertions(+), 1 deletions(-)\n\ndiff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt\nindex 352a494..f96142f 100644\n--- a/Documentation/git-commit.txt\n+++ b/Documentation/git-commit.txt\n@@ -8,7 +8,7 @@ git-commit - Record changes to the repository\n SYNOPSIS\n --------\n [verse]\n-'git-commit' [-a | --interactive] [-s] [-v]\n+'git-commit' [-a | --interactive] [-s] [-v] [-u]\n \t [(-c | -C) | -F | -m | --amend]\n \t [--no-verify] [-e] [--author ]\n \t [--] [[-i | -o ]...]\n@@ -115,6 +115,19 @@ but can be used to amend a merge commit.\n \tas well. This is usually not what you want unless you\n \tare concluding a conflicted merge.\n \n+-u|--untracked-files::\n+\tShow all untracked files, also those in uninteresting\n+\tdirectories, in the \"Untracked files:\" section of commit\n+\tmessage template. Without this option only its name and\n+\ta trailing slash are displayed for each untracked\n+\tdirectory.\n+\n+-v|--verbose::\n+\tShow unified diff between the HEAD commit and what\n+\twould be committed at the bottom of the commit message\n+\ttemplate. Note that this diff output doesn't have its\n+\tlines prefixed with '#'.\n+\n -q|--quiet::\n \tSuppress commit summary message.\n \n-- \n1.5.2.2\n"}]}