{"thread":{"id":"7672","subject":"[PATCH] Add policy on user-interface changes","startedAt":"2007-04-16T05:35:25Z","lastAt":"2007-04-19T03:03:37Z","messageCount":18,"participants":["Andrew Ruder","Junio C Hamano","Alex Riesen"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"39464","messageId":"20070416053525.GA18821@localdomain","threadId":"7672","inReplyTo":null,"subject":"[PATCH] Add policy on user-interface changes","fromName":"Andrew Ruder","fromEmail":"andy@aeruder.net","sentAt":"2007-04-16T05:35:25Z","receivedAt":"2007-04-16T05:35:25Z","isPatch":true,"sender":{"key":"andy@aeruder.net","avatar":"https://gravatar.com/avatar/cd5239f6d3c9acac61e817de7f7d497e518415e23720f170a10e0663a7981963?d=mp&s=160"},"body":"Documentation/SubmittingPatches: Add note that all user interface changes\nshould include associated documentation updates.\n\nSigned-off-by: Andrew Ruder \n---\n Documentation/SubmittingPatches | 3 +++\n 1 files changed, 3 insertions(+), 0 deletions(-)\n\ndiff --git a/Documentation/SubmittingPatches b/Documentation/SubmittingPatches\nindex 131bcff..2386f49 100644\n--- a/Documentation/SubmittingPatches\n+++ b/Documentation/SubmittingPatches\n@@ -22,6 +22,9 @@ Checklist (and a short version for the impatient):\n \t- provide additional information (which is unsuitable for\n \t the commit message) between the \"---\" and the diffstat\n \t- send the patch to the list _and_ the maintainer\n+\t- if you change, add, or remove a command line option or\n+\t make some other user interface change, the associated\n+\t documentation should be updated as well.\n \n Long version:\n \n-- \n1.5.1.1.98.gedb4f-dirty\n"},{"id":"39467","messageId":"20070416062016.GA19759@localdomain","threadId":"7672","inReplyTo":"20070416053525.GA18821@localdomain","subject":"[PATCH] Update git-am documentation","fromName":"Andrew Ruder","fromEmail":"andy@aeruder.net","sentAt":"2007-04-16T06:20:16Z","receivedAt":"2007-04-16T06:20:16Z","isPatch":true,"sender":{"key":"andy@aeruder.net","avatar":"https://gravatar.com/avatar/cd5239f6d3c9acac61e817de7f7d497e518415e23720f170a10e0663a7981963?d=mp&s=160"},"body":"Documentation/git-am.txt missing several short versions\nof options. Added documentation for --resolvemsg=\ncommand-line option.\n\nSigned-off-by: Andrew Ruder \n---\n Documentation/git-am.txt | 24 +++++++++++++++---------\n 1 files changed, 15 insertions(+), 9 deletions(-)\n\ndiff --git a/Documentation/git-am.txt b/Documentation/git-am.txt\nindex 148ce40..4af966a 100644\n--- a/Documentation/git-am.txt\n+++ b/Documentation/git-am.txt\n@@ -26,18 +26,18 @@ OPTIONS\n \tThe list of mailbox files to read patches from. If you do not\n \tsupply this argument, reads from the standard input.\n \n---signoff::\n+-s, --signoff::\n \tAdd `Signed-off-by:` line to the commit message, using\n \tthe committer identity of yourself.\n \n---dotest=::\n+-d=, --dotest=::\n \tInstead of `.dotest` directory, use as a working\n \tarea to store extracted patches.\n \n---keep::\n+-k, --keep::\n \tPass `-k` flag to `git-mailinfo` (see gitlink:git-mailinfo[1]).\n \n---utf8::\n+-u, --utf8::\n \tPass `-u` flag to `git-mailinfo` (see gitlink:git-mailinfo[1]).\n \tThe proposed commit log message taken from the e-mail\n \tare re-coded into UTF-8 encoding (configuration variable\n@@ -48,14 +48,14 @@ This was optional in prior versions of git, but now it is the\n default. You could use `--no-utf8` to override this.\n \n --no-utf8::\n-\tDo not pass `-u` flag to `git-mailinfo` (see\n+\tPass `-n` flag to `git-mailinfo` (see\n \tgitlink:git-mailinfo[1]).\n \n---binary::\n+-b, --binary::\n \tPass `--allow-binary-replacement` flag to `git-apply`\n \t(see gitlink:git-apply[1]).\n \n---3way::\n+-3, --3way::\n \tWhen the patch does not apply cleanly, fall back on\n \t3-way merge, if the patch records the identity of blobs\n \tit is supposed to apply to, and we have those blobs\n@@ -73,10 +73,10 @@ default. You could use `--no-utf8` to override this.\n \tThese flags are passed to the `git-apply` program that applies\n \tthe patch.\n \n---interactive::\n+-i, --interactive::\n \tRun interactively, just like git-applymbox.\n \n---resolved::\n+-r, --resolved::\n \tAfter a patch failure (e.g. attempting to apply\n \tconflicting patch), the user has applied it by hand and\n \tthe index file stores the result of the application.\n@@ -84,6 +84,12 @@ default. You could use `--no-utf8` to override this.\n \textracted from the e-mail message and the current index\n \tfile, and continue.\n \n+--resolvemsg=::\n+\tWhen a patch failure occurs, will be printed\n+\tto the screen before exiting. This overrides the\n+\tstandard message informing you to use `--resolved`\n+\tor `--skip` to handle the failure.\n+\n DISCUSSION\n ----------\n \n-- \n1.5.1.1.98.gedb4f-dirty\n"},{"id":"39468","messageId":"20070416062024.GB19759@localdomain","threadId":"7672","inReplyTo":"20070416053525.GA18821@localdomain","subject":"[PATCH] Update git-applymbox documentation","fromName":"Andrew Ruder","fromEmail":"andy@aeruder.net","sentAt":"2007-04-16T06:20:24Z","receivedAt":"2007-04-16T06:20:24Z","isPatch":true,"sender":{"key":"andy@aeruder.net","avatar":"https://gravatar.com/avatar/cd5239f6d3c9acac61e817de7f7d497e518415e23720f170a10e0663a7981963?d=mp&s=160"},"body":"fact that it encodes to the i18n.commitencoding setting, not just utf-8.\nAdded documentation of -n option to pass -n to git-mailinfo.\n\nSigned-off-by: Andrew Ruder \n---\n Documentation/git-applymbox.txt | 14 ++++++++++----\n 1 files changed, 10 insertions(+), 4 deletions(-)\n\ndiff --git a/Documentation/git-applymbox.txt b/Documentation/git-applymbox.txt\nindex 95dc65a..3bc92d8 100644\n--- a/Documentation/git-applymbox.txt\n+++ b/Documentation/git-applymbox.txt\n@@ -42,14 +42,20 @@ OPTIONS\n \tand the current tree.\n \n -u::\n-\tThe commit log message, author name and author email are\n-\ttaken from the e-mail, and after minimally decoding MIME\n-\ttransfer encoding, re-coded in UTF-8 by transliterating\n-\tthem. This used to be optional but now it is the default.\n+\tPass `-u` flag to `git-mailinfo` (see gitlink:git-mailinfo[1]).\n+\tThe proposed commit log message taken from the e-mail\n+\tare re-coded into UTF-8 encoding (configuration variable\n+\t`i18n.commitencoding` can be used to specify project's\n+\tpreferred encoding if it is not UTF-8). This used to be\n+\toptional but now it is the default.\n +\n Note that the patch is always used as-is without charset\n conversion, even with this flag.\n \n+-n::\n+\tPass `-n` flag to `git-mailinfo` (see\n+\tgitlink:git-mailinfo[1]).\n+\n -c .dotest/::\n \tWhen the patch contained in an e-mail does not cleanly\n \tapply, the command exits with an error message. The\n-- \n1.5.1.1.98.gedb4f-dirty\n"},{"id":"39469","messageId":"20070416062034.GC19759@localdomain","threadId":"7672","inReplyTo":"20070416053525.GA18821@localdomain","subject":"[PATCH] Update git-annotate/git-blame documentation","fromName":"Andrew Ruder","fromEmail":"andy@aeruder.net","sentAt":"2007-04-16T06:20:34Z","receivedAt":"2007-04-16T06:20:34Z","isPatch":true,"sender":{"key":"andy@aeruder.net","avatar":"https://gravatar.com/avatar/cd5239f6d3c9acac61e817de7f7d497e518415e23720f170a10e0663a7981963?d=mp&s=160"},"body":"Moved options that pertained to both git-blame and git-annotate to a\ncommon file blame-options.txt.\n\nbuiltin-blame.c: Removed --compatibility, --long, --time from the\nshort usage as they are not handled in the code.\n\nDocumentation/git-blame.txt: Removed common options to git-annotate.\nAdded documentation for --score-debug. Removed --compatibility.\nAdjusted usage at top to not wrap on 80 columns.\n\nDocumentation/git-annotate.txt: Using common options blame-options.txt.\n\nDocumentation/blame-options.txt: Added -b note about associated config\noption, added --root note about associated config option, added\ndocumentation for --show-stats. Removed --long, --time, --rev-file as\nthose options do not really exist. Added documentation for -M/-C taking\nan optional score argument for detection of moved lines.\n\nSigned-off-by: Andrew Ruder \n---\n Documentation/blame-options.txt | 67 +++++++++++++++++++++++++++++++++++++++\n Documentation/git-annotate.txt | 15 +--------\n Documentation/git-blame.txt | 64 ++++++++-----------------------------\n builtin-blame.c | 6 ++--\n 4 files changed, 85 insertions(+), 67 deletions(-)\n\ndiff --git a/Documentation/blame-options.txt b/Documentation/blame-options.txt\nnew file mode 100644\nindex 0000000..331f161\n--- /dev/null\n+++ b/Documentation/blame-options.txt\n@@ -0,0 +1,67 @@\n+-b::\n+\tShow blank SHA-1 for boundary commits. This can also\n+\tbe controlled via the `blame.blankboundary` config option.\n+\n+--root::\n+\tDo not treat root commits as boundaries. This can also be\n+\tcontrolled via the `blame.showroot` config option.\n+\n+--show-stats::\n+\tInclude additional statistics at the end of blame output.\n+\n+-L n,m::\n+\tAnnotate only the specified line range (lines count from 1).\n+\n+-l::\n+\tShow long rev (Default: off).\n+\n+-t::\n+\tShow raw timestamp (Default: off).\n+\n+-S ::\n+\tUse revs from revs-file instead of calling gitlink:git-rev-list[1].\n+\n+-p, --porcelain::\n+\tShow in a format designed for machine consumption.\n+\n+--incremental::\n+\tShow the result incrementally in a format designed for\n+\tmachine consumption.\n+\n+--contents ::\n+\tWhen is not specified, the command annotates the\n+\tchanges starting backwards from the working tree copy.\n+\tThis flag makes the command pretend as if the working\n+\ttree copy has the contents of he named file (specify\n+\t`-` to make the command read from the standard input).\n+\n+-M||::\n+\tDetect moving lines in the file as well. When a commit\n+\tmoves a block of lines in a file (e.g. the original file\n+\thas A and then B, and the commit changes it to B and\n+\tthen A), traditional 'blame' algorithm typically blames\n+\tthe lines that were moved up (i.e. B) to the parent and\n+\tassigns blame to the lines that were moved down (i.e. A)\n+\tto the child commit. With this option, both groups of lines\n+\tare blamed on the parent.\n+\n+\t is optional but it is the lower bound on the number of\n+\talphanumeric characters that git must detect as moving\n+\twithin a file for it to associate those lines with the parent\n+\tcommit.\n+\n+-C||::\n+\tIn addition to `-M`, detect lines copied from other\n+\tfiles that were modified in the same commit. This is\n+\tuseful when you reorganize your program and move code\n+\taround across files. When this option is given twice,\n+\tthe command looks for copies from all other files in the\n+\tparent for the commit that creates the file in addition.\n+\n+\t is optional but it is the lower bound on the number of\n+\talphanumeric characters that git must detect as moving\n+\tbetween files for it to associate those lines with the parent\n+\tcommit.\n+\n+-h, --help::\n+\tShow help message.\ndiff --git a/Documentation/git-annotate.txt b/Documentation/git-annotate.txt\nindex 7baf731..02dc474 100644\n--- a/Documentation/git-annotate.txt\n+++ b/Documentation/git-annotate.txt\n@@ -16,20 +16,7 @@ which introduced the line. Optionally annotate from a given revision.\n \n OPTIONS\n -------\n--l, --long::\n-\tShow long rev (Defaults off).\n-\n--t, --time::\n-\tShow raw timestamp (Defaults off).\n-\n--r, --rename::\n-\tFollow renames (Defaults on).\n-\n--S, --rev-file ::\n-\tUse revs from revs-file instead of calling git-rev-list.\n-\n--h, --help::\n-\tShow help message.\n+include::blame-options.txt[]\n \n SEE ALSO\n --------\ndiff --git a/Documentation/git-blame.txt b/Documentation/git-blame.txt\nindex 5c9888d..8f9439a 100644\n--- a/Documentation/git-blame.txt\n+++ b/Documentation/git-blame.txt\n@@ -8,8 +8,9 @@ git-blame - Show what revision and author last modified each line of a file\n SYNOPSIS\n --------\n [verse]\n-'git-blame' [-c] [-l] [-t] [-f] [-n] [-p] [--incremental] [-L n,m] [-S ]\n- [-M] [-C] [-C] [--since=] [ | --contents ] [--] \n+'git-blame' [-c] [-l] [-t] [-f] [-n] [-p] [--incremental] [-L n,m]\n+ [-S ] [-M] [-C] [-C] [--since=]\n+ [ | --contents ] [--] \n \n DESCRIPTION\n -----------\n@@ -37,20 +38,19 @@ ea4c7f9bf69e781dd0cd88d2bccb2bf5cc15c9a7 git-blame: Make the output\n \n OPTIONS\n -------\n--c, --compatibility::\n-\tUse the same output mode as gitlink:git-annotate[1] (Default: off).\n-\n--L n,m::\n-\tAnnotate only the specified line range (lines count from 1).\n-\n--l, --long::\n-\tShow long rev (Default: off).\n+include::blame-options.txt[]\n \n--t, --time::\n-\tShow raw timestamp (Default: off).\n+-c::\n+\tUse the same output mode as gitlink:git-annotate[1] (Default: off).\n \n--S, --rev-file ::\n-\tUse revs from revs-file instead of calling gitlink:git-rev-list[1].\n+--score-debug::\n+\tInclude debugging information related to the movement of\n+\tlines between files (see `-C`) and lines moved within a\n+\tfile (see `-M`). The first number listed is the score.\n+\tThis is the number of alphanumeric characters detected\n+\tto be moved between or within files. This must be above\n+\ta certain threshold for git-blame to consider those lines\n+\tof code to have been moved.\n \n -f, --show-name::\n \tShow filename in the original commit. By default\n@@ -60,42 +60,6 @@ OPTIONS\n -n, --show-number::\n \tShow line number in the original commit (Default: off).\n \n--p, --porcelain::\n-\tShow in a format designed for machine consumption.\n-\n---incremental::\n-\tShow the result incrementally in a format designed for\n-\tmachine consumption.\n-\n---contents ::\n-\tWhen is not specified, the command annotates the\n-\tchanges starting backwards from the working tree copy.\n-\tThis flag makes the command pretend as if the working\n-\ttree copy has the contents of he named file (specify\n-\t`-` to make the command read from the standard input).\n-\n--M::\n-\tDetect moving lines in the file as well. When a commit\n-\tmoves a block of lines in a file (e.g. the original file\n-\thas A and then B, and the commit changes it to B and\n-\tthen A), traditional 'blame' algorithm typically blames\n-\tthe lines that were moved up (i.e. B) to the parent and\n-\tassigns blame to the lines that were moved down (i.e. A)\n-\tto the child commit. With this option, both groups of\n-\tlines are blamed on the parent.\n-\n--C::\n-\tIn addition to `-M`, detect lines copied from other\n-\tfiles that were modified in the same commit. This is\n-\tuseful when you reorganize your program and move code\n-\taround across files. When this option is given twice,\n-\tthe command looks for copies from all other files in the\n-\tparent for the commit that creates the file in addition.\n-\n--h, --help::\n-\tShow help message.\n-\n-\n THE PORCELAIN FORMAT\n --------------------\n \ndiff --git a/builtin-blame.c b/builtin-blame.c\nindex 60ec535..3a1a17f 100644\n--- a/builtin-blame.c\n+++ b/builtin-blame.c\n@@ -19,11 +19,11 @@\n \n static char blame_usage[] =\n \"git-blame [-c] [-l] [-t] [-f] [-n] [-p] [-L n,m] [-S ] [-M] [-C] [-C] [--contents ] [--incremental] [commit] [--] file\\n\"\n-\" -c, --compatibility Use the same output mode as git-annotate (Default: off)\\n\"\n+\" -c Use the same output mode as git-annotate (Default: off)\\n\"\n \" -b Show blank SHA-1 for boundary commits (Default: off)\\n\"\n-\" -l, --long Show long commit SHA1 (Default: off)\\n\"\n+\" -l Show long commit SHA1 (Default: off)\\n\"\n \" --root Do not treat root commits as boundaries (Default: off)\\n\"\n-\" -t, --time Show raw timestamp (Default: off)\\n\"\n+\" -t Show raw timestamp (Default: off)\\n\"\n \" -f, --show-name Show original filename (Default: auto)\\n\"\n \" -n, --show-number Show original linenumber (Default: off)\\n\"\n \" -p, --porcelain Show in a format designed for machine consumption\\n\"\n-- \n1.5.1.1.98.gedb4f-dirty\n"},{"id":"39470","messageId":"20070416062040.GD19759@localdomain","threadId":"7672","inReplyTo":"20070416053525.GA18821@localdomain","subject":"[PATCH] Update git-apply documentation","fromName":"Andrew Ruder","fromEmail":"andy@aeruder.net","sentAt":"2007-04-16T06:20:40Z","receivedAt":"2007-04-16T06:20:40Z","isPatch":true,"sender":{"key":"andy@aeruder.net","avatar":"https://gravatar.com/avatar/cd5239f6d3c9acac61e817de7f7d497e518415e23720f170a10e0663a7981963?d=mp&s=160"},"body":"Document -v (short form of --verbose). Redo usage\nto not wrap on 80 column terminal with typical\nsettings.\n\nSigned-off-by: Andrew Ruder \n---\n Documentation/git-apply.txt | 13 +++++++------\n 1 files changed, 7 insertions(+), 6 deletions(-)\n\ndiff --git a/Documentation/git-apply.txt b/Documentation/git-apply.txt\nindex 065ba1b..3bd2c99 100644\n--- a/Documentation/git-apply.txt\n+++ b/Documentation/git-apply.txt\n@@ -9,11 +9,12 @@ git-apply - Apply a patch on a git index file and a working tree\n SYNOPSIS\n --------\n [verse]\n-'git-apply' [--stat] [--numstat] [--summary] [--check] [--index] [--apply]\n-\t [--no-add] [--index-info] [--allow-binary-replacement | --binary]\n-\t [-R | --reverse] [--reject] [-z] [-pNUM] [-CNUM] [--inaccurate-eof]\n-\t [--whitespace=] [--exclude=PATH]\n-\t [--cached] [--verbose] [...]\n+'git-apply' [--stat] [--numstat] [--summary] [--check] [--index]\n+\t [--apply] [--no-add] [--index-info] [-R | --reverse]\n+\t [--allow-binary-replacement | --binary] [--reject] [-z]\n+\t [-pNUM] [-CNUM] [--inaccurate-eof] [--cached]\n+\t [--whitespace=]\n+\t [--exclude=PATH] [--verbose] [...]\n \n DESCRIPTION\n -----------\n@@ -158,7 +159,7 @@ discouraged.\n \tcorrectly. This option adds support for applying such patches by\n \tworking around this bug.\n \n---verbose::\n+-v, --verbose::\n \tReport progress to stderr. By default, only a message about the\n \tcurrent patch being applied will be printed. This option will cause\n \tadditional information to be reported.\n-- \n1.5.1.1.98.gedb4f-dirty\n"},{"id":"39473","messageId":"20070416064006.GA20240@localdomain","threadId":"7672","inReplyTo":"20070416062024.GB19759@localdomain","subject":"[PATCH] Update git-applymbox documentation","fromName":"Andrew Ruder","fromEmail":"andy@aeruder.net","sentAt":"2007-04-16T06:40:06Z","receivedAt":"2007-04-16T06:40:06Z","isPatch":true,"sender":{"key":"andy@aeruder.net","avatar":"https://gravatar.com/avatar/cd5239f6d3c9acac61e817de7f7d497e518415e23720f170a10e0663a7981963?d=mp&s=160"},"body":"Documentation/git-applymbox.txt: updating -u documentation to include\nfact that it encodes to the i18n.commitencoding setting, not just utf-8.\nAdded documentation of -n option to pass -n to git-mailinfo.\n\nSigned-off-by: Andrew Ruder \n---\n Resending due to my bad .git/config interacting with mutt to\n wipe out first line of commit message\n\n Documentation/git-applymbox.txt | 14 ++++++++++----\n 1 files changed, 10 insertions(+), 4 deletions(-)\n\ndiff --git a/Documentation/git-applymbox.txt b/Documentation/git-applymbox.txt\nindex 95dc65a..3bc92d8 100644\n--- a/Documentation/git-applymbox.txt\n+++ b/Documentation/git-applymbox.txt\n@@ -42,14 +42,20 @@ OPTIONS\n \tand the current tree.\n \n -u::\n-\tThe commit log message, author name and author email are\n-\ttaken from the e-mail, and after minimally decoding MIME\n-\ttransfer encoding, re-coded in UTF-8 by transliterating\n-\tthem. This used to be optional but now it is the default.\n+\tPass `-u` flag to `git-mailinfo` (see gitlink:git-mailinfo[1]).\n+\tThe proposed commit log message taken from the e-mail\n+\tare re-coded into UTF-8 encoding (configuration variable\n+\t`i18n.commitencoding` can be used to specify project's\n+\tpreferred encoding if it is not UTF-8). This used to be\n+\toptional but now it is the default.\n +\n Note that the patch is always used as-is without charset\n conversion, even with this flag.\n \n+-n::\n+\tPass `-n` flag to `git-mailinfo` (see\n+\tgitlink:git-mailinfo[1]).\n+\n -c .dotest/::\n \tWhen the patch contained in an e-mail does not cleanly\n \tapply, the command exits with an error message. The\n-- \n1.5.1.1.98.gedb4f-dirty\n"},{"id":"39475","messageId":"7vabx8x0x7.fsf@assigned-by-dhcp.cox.net","threadId":"7672","inReplyTo":"20070416062016.GA19759@localdomain","subject":"Re: [PATCH] Update git-am documentation","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2007-04-16T06:56:20Z","receivedAt":"2007-04-16T06:56:20Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Andrew Ruder writes:\n\n> Documentation/git-am.txt missing several short versions\n\nShort ones were semi deliberately left out, but I do not think\nadding them would hurt.\n\n> ... Added documentation for --resolvemsg=\n> command-line option.\n\nOn the other hand, this was purely meant as an internal\ncommunication tool for the commands that invoke am, so I do not\nthink it is wise to document it without saying that, as I think\nanybody reading your new documentation would end up asking \"Huh?\nwhat use is that?\".\n"},{"id":"39479","messageId":"20070416072131.GA20722@localdomain","threadId":"7672","inReplyTo":"7vabx8x0x7.fsf@assigned-by-dhcp.cox.net","subject":"[PATCH] Update git-am documentation","fromName":"Andrew Ruder","fromEmail":"andy@aeruder.net","sentAt":"2007-04-16T07:21:31Z","receivedAt":"2007-04-16T07:21:31Z","isPatch":true,"sender":{"key":"andy@aeruder.net","avatar":"https://gravatar.com/avatar/cd5239f6d3c9acac61e817de7f7d497e518415e23720f170a10e0663a7981963?d=mp&s=160"},"body":"Documentation/git-am.txt missing several short versions\nof options. Added documentation for --resolvemsg=\ncommand-line option.\n\nSigned-off-by: Andrew Ruder \n---\n Sometimes it is a bit difficult to gauge intention by reading the code.\n :) My initial thought was that it was just to aid in scripting git-am\n and left it at that. But I'd still much rather have all command-line\n options in the man pages even if they are primarily for internal use as\n sometimes they still will find themself useful in atypical situations.\n\n Documentation/git-am.txt | 25 ++++++++++++++++---------\n 1 files changed, 16 insertions(+), 9 deletions(-)\n\ndiff --git a/Documentation/git-am.txt b/Documentation/git-am.txt\nindex 148ce40..2230340 100644\n--- a/Documentation/git-am.txt\n+++ b/Documentation/git-am.txt\n@@ -26,18 +26,18 @@ OPTIONS\n \tThe list of mailbox files to read patches from. If you do not\n \tsupply this argument, reads from the standard input.\n \n---signoff::\n+-s, --signoff::\n \tAdd `Signed-off-by:` line to the commit message, using\n \tthe committer identity of yourself.\n \n---dotest=::\n+-d=, --dotest=::\n \tInstead of `.dotest` directory, use as a working\n \tarea to store extracted patches.\n \n---keep::\n+-k, --keep::\n \tPass `-k` flag to `git-mailinfo` (see gitlink:git-mailinfo[1]).\n \n---utf8::\n+-u, --utf8::\n \tPass `-u` flag to `git-mailinfo` (see gitlink:git-mailinfo[1]).\n \tThe proposed commit log message taken from the e-mail\n \tare re-coded into UTF-8 encoding (configuration variable\n@@ -48,14 +48,14 @@ This was optional in prior versions of git, but now it is the\n default. You could use `--no-utf8` to override this.\n \n --no-utf8::\n-\tDo not pass `-u` flag to `git-mailinfo` (see\n+\tPass `-n` flag to `git-mailinfo` (see\n \tgitlink:git-mailinfo[1]).\n \n---binary::\n+-b, --binary::\n \tPass `--allow-binary-replacement` flag to `git-apply`\n \t(see gitlink:git-apply[1]).\n \n---3way::\n+-3, --3way::\n \tWhen the patch does not apply cleanly, fall back on\n \t3-way merge, if the patch records the identity of blobs\n \tit is supposed to apply to, and we have those blobs\n@@ -73,10 +73,10 @@ default. You could use `--no-utf8` to override this.\n \tThese flags are passed to the `git-apply` program that applies\n \tthe patch.\n \n---interactive::\n+-i, --interactive::\n \tRun interactively, just like git-applymbox.\n \n---resolved::\n+-r, --resolved::\n \tAfter a patch failure (e.g. attempting to apply\n \tconflicting patch), the user has applied it by hand and\n \tthe index file stores the result of the application.\n@@ -84,6 +84,13 @@ default. You could use `--no-utf8` to override this.\n \textracted from the e-mail message and the current index\n \tfile, and continue.\n \n+--resolvemsg=::\n+\tWhen a patch failure occurs, will be printed\n+\tto the screen before exiting. This overrides the\n+\tstandard message informing you to use `--resolved`\n+\tor `--skip` to handle the failure. This is primarily\n+\tfor internal usage or scripting around git-am.\n+\n DISCUSSION\n ----------\n \n-- \n1.5.1.1.98.gedb4f-dirty\n"},{"id":"39480","messageId":"81b0412b0704160024i4c202efey5eb54d382d003bbd@mail.gmail.com","threadId":"7672","inReplyTo":"20070416062034.GC19759@localdomain","subject":"Re: [PATCH] Update git-annotate/git-blame documentation","fromName":"Alex Riesen","fromEmail":"raa.lkml@gmail.com","sentAt":"2007-04-16T07:24:08Z","receivedAt":"2007-04-16T07:24:08Z","isPatch":true,"sender":{"key":"raa.lkml@gmail.com","avatar":"https://avatars.githubusercontent.com/u/324101?v=4"},"body":"On 4/16/07, Andrew Ruder wrote:\n> +-L n,m::\n> + Annotate only the specified line range (lines count from 1).\n> +\n> +-l::\n> + Show long rev (Default: off).\n> +\n> +-t::\n> + Show raw timestamp (Default: off).\n\nVery nice, mentioning this small details. Thanks!\n"},{"id":"39481","messageId":"20070416072623.GB20240@localdomain","threadId":"7672","inReplyTo":"81b0412b0704160024i4c202efey5eb54d382d003bbd@mail.gmail.com","subject":"Re: [PATCH] Update git-annotate/git-blame documentation","fromName":"Andrew Ruder","fromEmail":"andy@aeruder.net","sentAt":"2007-04-16T07:26:23Z","receivedAt":"2007-04-16T07:26:23Z","isPatch":true,"sender":{"key":"andy@aeruder.net","avatar":"https://gravatar.com/avatar/cd5239f6d3c9acac61e817de7f7d497e518415e23720f170a10e0663a7981963?d=mp&s=160"},"body":"On Mon, Apr 16, 2007 at 09:24:08AM +0200, Alex Riesen wrote:\n> On 4/16/07, Andrew Ruder wrote:\n> >+-L n,m::\n> >+ Annotate only the specified line range (lines count from 1).\n> >+\n> >+-l::\n> >+ Show long rev (Default: off).\n> >+\n> >+-t::\n> >+ Show raw timestamp (Default: off).\n> \n> Very nice, mentioning this small details. Thanks!\n\nThose particular items I didn't write, so I'm going to bounce that\nthanks off to whoever did. :)\n\n-- \nAndrew Ruder \nhttp://www.aeruder.net\n"},{"id":"39485","messageId":"7vy7ksvjxt.fsf@assigned-by-dhcp.cox.net","threadId":"7672","inReplyTo":"20070416072131.GA20722@localdomain","subject":"Re: [PATCH] Update git-am documentation","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2007-04-16T07:48:30Z","receivedAt":"2007-04-16T07:48:30Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Andrew Ruder writes:\n\n> Documentation/git-am.txt missing several short versions\n> of options. Added documentation for --resolvemsg=\n> command-line option.\n>\n> Signed-off-by: Andrew Ruder \n> ---\n> Sometimes it is a bit difficult to gauge intention by reading the code.\n> :) My initial thought was that it was just to aid in scripting git-am\n> and left it at that. But I'd still much rather have all command-line\n> options in the man pages even if they are primarily for internal use as\n> sometimes they still will find themself useful in atypical situations.\n\nIt is _solely_ (not \"primarily\") for git-rebase and not even for\n\"scripting around\". In other words, it is an implementation\ndetail of git-rebase and I would rather reserve the right to\nupdate that implementation detail by not setting that in stone\nfor users to abuse.\n"},{"id":"39486","messageId":"7vtzvgvjrv.fsf@assigned-by-dhcp.cox.net","threadId":"7672","inReplyTo":"20070416072623.GB20240@localdomain","subject":"Re: [PATCH] Update git-annotate/git-blame documentation","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2007-04-16T07:52:04Z","receivedAt":"2007-04-16T07:52:04Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Andrew Ruder writes:\n\n> On Mon, Apr 16, 2007 at 09:24:08AM +0200, Alex Riesen wrote:\n>> On 4/16/07, Andrew Ruder wrote:\n>> >+-L n,m::\n>> >+ Annotate only the specified line range (lines count from 1).\n>> >+\n>> >+-l::\n>> >+ Show long rev (Default: off).\n>> >+\n>> >+-t::\n>> >+ Show raw timestamp (Default: off).\n>> \n>> Very nice, mentioning this small details. Thanks!\n>\n> Those particular items I didn't write, so I'm going to bounce that\n> thanks off to whoever did. :)\n\nI almost never give line numbers to -L, by the way.\n\n\t$ git log --grep=-L -- builtin-blame.c builtin-pickaxe.c\n\nwould give enough raw material to update the section with.\n"},{"id":"39521","messageId":"20070416124731.GA23429@localdomain","threadId":"7672","inReplyTo":"7vy7ksvjxt.fsf@assigned-by-dhcp.cox.net","subject":"[PATCH] Update git-am documentation","fromName":"Andrew Ruder","fromEmail":"andy@aeruder.net","sentAt":"2007-04-16T12:47:31Z","receivedAt":"2007-04-16T12:47:31Z","isPatch":true,"sender":{"key":"andy@aeruder.net","avatar":"https://gravatar.com/avatar/cd5239f6d3c9acac61e817de7f7d497e518415e23720f170a10e0663a7981963?d=mp&s=160"},"body":"Documentation/git-am.txt missing several short versions\nof options.\n\nSigned-off-by: Andrew Ruder \n---\n Ah, I misunderstood your first reply. If this is truly only for\n internal usage, it should definitely not be in the manpage as\n abuse *will* occur. :) Let's just hope that nobody finds this thread\n via the mailing list archives.\n\n Documentation/git-am.txt | 18 +++++++++---------\n 1 files changed, 9 insertions(+), 9 deletions(-)\n\ndiff --git a/Documentation/git-am.txt b/Documentation/git-am.txt\nindex 148ce40..759e3a5 100644\n--- a/Documentation/git-am.txt\n+++ b/Documentation/git-am.txt\n@@ -26,18 +26,18 @@ OPTIONS\n \tThe list of mailbox files to read patches from. If you do not\n \tsupply this argument, reads from the standard input.\n \n---signoff::\n+-s, --signoff::\n \tAdd `Signed-off-by:` line to the commit message, using\n \tthe committer identity of yourself.\n \n---dotest=::\n+-d=, --dotest=::\n \tInstead of `.dotest` directory, use as a working\n \tarea to store extracted patches.\n \n---keep::\n+-k, --keep::\n \tPass `-k` flag to `git-mailinfo` (see gitlink:git-mailinfo[1]).\n \n---utf8::\n+-u, --utf8::\n \tPass `-u` flag to `git-mailinfo` (see gitlink:git-mailinfo[1]).\n \tThe proposed commit log message taken from the e-mail\n \tare re-coded into UTF-8 encoding (configuration variable\n@@ -48,14 +48,14 @@ This was optional in prior versions of git, but now it is the\n default. You could use `--no-utf8` to override this.\n \n --no-utf8::\n-\tDo not pass `-u` flag to `git-mailinfo` (see\n+\tPass `-n` flag to `git-mailinfo` (see\n \tgitlink:git-mailinfo[1]).\n \n---binary::\n+-b, --binary::\n \tPass `--allow-binary-replacement` flag to `git-apply`\n \t(see gitlink:git-apply[1]).\n \n---3way::\n+-3, --3way::\n \tWhen the patch does not apply cleanly, fall back on\n \t3-way merge, if the patch records the identity of blobs\n \tit is supposed to apply to, and we have those blobs\n@@ -73,10 +73,10 @@ default. You could use `--no-utf8` to override this.\n \tThese flags are passed to the `git-apply` program that applies\n \tthe patch.\n \n---interactive::\n+-i, --interactive::\n \tRun interactively, just like git-applymbox.\n \n---resolved::\n+-r, --resolved::\n \tAfter a patch failure (e.g. attempting to apply\n \tconflicting patch), the user has applied it by hand and\n \tthe index file stores the result of the application.\n-- \n1.5.1.1.98.gedb4f-dirty\n"},{"id":"39589","messageId":"20070417024516.GA28478@bowser.ruder","threadId":"7672","inReplyTo":"7vtzvgvjrv.fsf@assigned-by-dhcp.cox.net","subject":"[PATCH] Update git-annotate/git-blame documentation","fromName":"Andrew Ruder","fromEmail":"andy@aeruder.net","sentAt":"2007-04-17T02:45:17Z","receivedAt":"2007-04-17T02:45:17Z","isPatch":true,"sender":{"key":"andy@aeruder.net","avatar":"https://gravatar.com/avatar/cd5239f6d3c9acac61e817de7f7d497e518415e23720f170a10e0663a7981963?d=mp&s=160"},"body":"Moved options that pertained to both git-blame and git-annotate to a\ncommon file blame-options.txt.\n\nbuiltin-blame.c: Removed --compatibility, --long, --time from the\nshort usage as they are not handled in the code.\n\nDocumentation/git-blame.txt: Removed common options to git-annotate.\nAdded documentation for --score-debug. Removed --compatibility.\nAdjusted usage at top to not wrap on 80 columns.\n\nDocumentation/git-annotate.txt: Using common options blame-options.txt.\n\nDocumentation/blame-options.txt: Added -b note about associated config\noption, added --root note about associated config option, added\ndocumentation for --show-stats. Removed --long, --time, --rev-file as\nthose options do not really exist. Added documentation for -M/-C taking\nan optional score argument for detection of moved lines.\n\nAdded additional forms for -L n,m to man page (/regex/ and\n+offset/-offset)\n\nSigned-off-by: Andrew Ruder \n---\n Thanks for the pointers on the -L flag, those are some very useful ways\n of specifying line numbers. :)\n \n Documentation/blame-options.txt | 87 +++++++++++++++++++++++++++++++++++++++\n Documentation/git-annotate.txt | 15 +------\n Documentation/git-blame.txt | 64 ++++++----------------------\n builtin-blame.c | 6 +-\n 4 files changed, 105 insertions(+), 67 deletions(-)\n\ndiff --git a/Documentation/blame-options.txt b/Documentation/blame-options.txt\nnew file mode 100644\nindex 0000000..0099bb2\n--- /dev/null\n+++ b/Documentation/blame-options.txt\n@@ -0,0 +1,87 @@\n+-b::\n+\tShow blank SHA-1 for boundary commits. This can also\n+\tbe controlled via the `blame.blankboundary` config option.\n+\n+--root::\n+\tDo not treat root commits as boundaries. This can also be\n+\tcontrolled via the `blame.showroot` config option.\n+\n+--show-stats::\n+\tInclude additional statistics at the end of blame output.\n+\n+-L ,::\n+\tAnnotate only the given line range. and can take\n+\tone of these forms:\n+\n+\t- number\n++\n+\tIf or is a number, it specifies an\n+\tabsolute line number (lines count from 1).\n++\n+\n+\t- /regex/\n++\n+\tThis form will use the first line matching the given\n+\tPOSIX regex. If is a regex, it will search\n+\tstarting at the line given by .\n++\n+\n+\t- +offset or -offset\n++\n+\tThis is only valid for and will specify a number\n+\tof lines before or after the line given by .\n++\n+\n+-l::\n+\tShow long rev (Default: off).\n+\n+-t::\n+\tShow raw timestamp (Default: off).\n+\n+-S ::\n+\tUse revs from revs-file instead of calling gitlink:git-rev-list[1].\n+\n+-p, --porcelain::\n+\tShow in a format designed for machine consumption.\n+\n+--incremental::\n+\tShow the result incrementally in a format designed for\n+\tmachine consumption.\n+\n+--contents ::\n+\tWhen is not specified, the command annotates the\n+\tchanges starting backwards from the working tree copy.\n+\tThis flag makes the command pretend as if the working\n+\ttree copy has the contents of he named file (specify\n+\t`-` to make the command read from the standard input).\n+\n+-M||::\n+\tDetect moving lines in the file as well. When a commit\n+\tmoves a block of lines in a file (e.g. the original file\n+\thas A and then B, and the commit changes it to B and\n+\tthen A), traditional 'blame' algorithm typically blames\n+\tthe lines that were moved up (i.e. B) to the parent and\n+\tassigns blame to the lines that were moved down (i.e. A)\n+\tto the child commit. With this option, both groups of lines\n+\tare blamed on the parent.\n+\n+\t is optional but it is the lower bound on the number of\n+\talphanumeric characters that git must detect as moving\n+\twithin a file for it to associate those lines with the parent\n+\tcommit.\n+\n+-C||::\n+\tIn addition to `-M`, detect lines copied from other\n+\tfiles that were modified in the same commit. This is\n+\tuseful when you reorganize your program and move code\n+\taround across files. When this option is given twice,\n+\tthe command looks for copies from all other files in the\n+\tparent for the commit that creates the file in addition.\n+\n+\t is optional but it is the lower bound on the number of\n+\talphanumeric characters that git must detect as moving\n+\tbetween files for it to associate those lines with the parent\n+\tcommit.\n+\n+-h, --help::\n+\tShow help message.\ndiff --git a/Documentation/git-annotate.txt b/Documentation/git-annotate.txt\nindex 7baf731..02dc474 100644\n--- a/Documentation/git-annotate.txt\n+++ b/Documentation/git-annotate.txt\n@@ -16,20 +16,7 @@ which introduced the line. Optionally annotate from a given revision.\n \n OPTIONS\n -------\n--l, --long::\n-\tShow long rev (Defaults off).\n-\n--t, --time::\n-\tShow raw timestamp (Defaults off).\n-\n--r, --rename::\n-\tFollow renames (Defaults on).\n-\n--S, --rev-file ::\n-\tUse revs from revs-file instead of calling git-rev-list.\n-\n--h, --help::\n-\tShow help message.\n+include::blame-options.txt[]\n \n SEE ALSO\n --------\ndiff --git a/Documentation/git-blame.txt b/Documentation/git-blame.txt\nindex 5c9888d..8f9439a 100644\n--- a/Documentation/git-blame.txt\n+++ b/Documentation/git-blame.txt\n@@ -8,8 +8,9 @@ git-blame - Show what revision and author last modified each line of a file\n SYNOPSIS\n --------\n [verse]\n-'git-blame' [-c] [-l] [-t] [-f] [-n] [-p] [--incremental] [-L n,m] [-S ]\n- [-M] [-C] [-C] [--since=] [ | --contents ] [--] \n+'git-blame' [-c] [-l] [-t] [-f] [-n] [-p] [--incremental] [-L n,m]\n+ [-S ] [-M] [-C] [-C] [--since=]\n+ [ | --contents ] [--] \n \n DESCRIPTION\n -----------\n@@ -37,20 +38,19 @@ ea4c7f9bf69e781dd0cd88d2bccb2bf5cc15c9a7 git-blame: Make the output\n \n OPTIONS\n -------\n--c, --compatibility::\n-\tUse the same output mode as gitlink:git-annotate[1] (Default: off).\n-\n--L n,m::\n-\tAnnotate only the specified line range (lines count from 1).\n-\n--l, --long::\n-\tShow long rev (Default: off).\n+include::blame-options.txt[]\n \n--t, --time::\n-\tShow raw timestamp (Default: off).\n+-c::\n+\tUse the same output mode as gitlink:git-annotate[1] (Default: off).\n \n--S, --rev-file ::\n-\tUse revs from revs-file instead of calling gitlink:git-rev-list[1].\n+--score-debug::\n+\tInclude debugging information related to the movement of\n+\tlines between files (see `-C`) and lines moved within a\n+\tfile (see `-M`). The first number listed is the score.\n+\tThis is the number of alphanumeric characters detected\n+\tto be moved between or within files. This must be above\n+\ta certain threshold for git-blame to consider those lines\n+\tof code to have been moved.\n \n -f, --show-name::\n \tShow filename in the original commit. By default\n@@ -60,42 +60,6 @@ OPTIONS\n -n, --show-number::\n \tShow line number in the original commit (Default: off).\n \n--p, --porcelain::\n-\tShow in a format designed for machine consumption.\n-\n---incremental::\n-\tShow the result incrementally in a format designed for\n-\tmachine consumption.\n-\n---contents ::\n-\tWhen is not specified, the command annotates the\n-\tchanges starting backwards from the working tree copy.\n-\tThis flag makes the command pretend as if the working\n-\ttree copy has the contents of he named file (specify\n-\t`-` to make the command read from the standard input).\n-\n--M::\n-\tDetect moving lines in the file as well. When a commit\n-\tmoves a block of lines in a file (e.g. the original file\n-\thas A and then B, and the commit changes it to B and\n-\tthen A), traditional 'blame' algorithm typically blames\n-\tthe lines that were moved up (i.e. B) to the parent and\n-\tassigns blame to the lines that were moved down (i.e. A)\n-\tto the child commit. With this option, both groups of\n-\tlines are blamed on the parent.\n-\n--C::\n-\tIn addition to `-M`, detect lines copied from other\n-\tfiles that were modified in the same commit. This is\n-\tuseful when you reorganize your program and move code\n-\taround across files. When this option is given twice,\n-\tthe command looks for copies from all other files in the\n-\tparent for the commit that creates the file in addition.\n-\n--h, --help::\n-\tShow help message.\n-\n-\n THE PORCELAIN FORMAT\n --------------------\n \ndiff --git a/builtin-blame.c b/builtin-blame.c\nindex 60ec535..3a1a17f 100644\n--- a/builtin-blame.c\n+++ b/builtin-blame.c\n@@ -19,11 +19,11 @@\n \n static char blame_usage[] =\n \"git-blame [-c] [-l] [-t] [-f] [-n] [-p] [-L n,m] [-S ] [-M] [-C] [-C] [--contents ] [--incremental] [commit] [--] file\\n\"\n-\" -c, --compatibility Use the same output mode as git-annotate (Default: off)\\n\"\n+\" -c Use the same output mode as git-annotate (Default: off)\\n\"\n \" -b Show blank SHA-1 for boundary commits (Default: off)\\n\"\n-\" -l, --long Show long commit SHA1 (Default: off)\\n\"\n+\" -l Show long commit SHA1 (Default: off)\\n\"\n \" --root Do not treat root commits as boundaries (Default: off)\\n\"\n-\" -t, --time Show raw timestamp (Default: off)\\n\"\n+\" -t Show raw timestamp (Default: off)\\n\"\n \" -f, --show-name Show original filename (Default: auto)\\n\"\n \" -n, --show-number Show original linenumber (Default: off)\\n\"\n \" -p, --porcelain Show in a format designed for machine consumption\\n\"\n-- \n1.5.1.1.98.gedb4f-dirty\n"},{"id":"39858","messageId":"20070419030313.GA19402@bowser.ruder","threadId":"7672","inReplyTo":"20070416053525.GA18821@localdomain","subject":"[PATCH] Update git-archive documentation","fromName":"Andrew Ruder","fromEmail":"andy@aeruder.net","sentAt":"2007-04-19T03:03:14Z","receivedAt":"2007-04-19T03:03:14Z","isPatch":true,"sender":{"key":"andy@aeruder.net","avatar":"https://gravatar.com/avatar/cd5239f6d3c9acac61e817de7f7d497e518415e23720f170a10e0663a7981963?d=mp&s=160"},"body":"Documentation/git-archive.txt: Document -v/--verbose option.\nAdd -l as short form of --list.\n\nSigned-off-by: Andrew Ruder \n---\n Documentation/git-archive.txt | 5 ++++-\n 1 files changed, 4 insertions(+), 1 deletions(-)\n\ndiff --git a/Documentation/git-archive.txt b/Documentation/git-archive.txt\nindex 8d10415..d3ca9a9 100644\n--- a/Documentation/git-archive.txt\n+++ b/Documentation/git-archive.txt\n@@ -33,9 +33,12 @@ OPTIONS\n \tFormat of the resulting archive: 'tar', 'zip'... The default\n \tis 'tar'.\n \n---list::\n+--list, -l::\n \tShow all available formats.\n \n+--verbose, -v::\n+\tReport progress to stderr.\n+\n --prefix=/::\n \tPrepend / to each filename in the archive.\n \n-- \n1.5.1.1.116.g8c4c\n"},{"id":"39860","messageId":"20070419030326.GB19402@bowser.ruder","threadId":"7672","inReplyTo":"20070416053525.GA18821@localdomain","subject":"[PATCH] Update git-cherry-pick documentation","fromName":"Andrew Ruder","fromEmail":"andy@aeruder.net","sentAt":"2007-04-19T03:03:26Z","receivedAt":"2007-04-19T03:03:26Z","isPatch":true,"sender":{"key":"andy@aeruder.net","avatar":"https://gravatar.com/avatar/cd5239f6d3c9acac61e817de7f7d497e518415e23720f170a10e0663a7981963?d=mp&s=160"},"body":"Documentation/git-cherry-pick.txt: Remove --replay as it is not\nhandled by the code (-r is however).\n\nSigned-off-by: Andrew Ruder \n---\n Documentation/git-cherry-pick.txt | 2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n\ndiff --git a/Documentation/git-cherry-pick.txt b/Documentation/git-cherry-pick.txt\nindex 3149d08..68bba98 100644\n--- a/Documentation/git-cherry-pick.txt\n+++ b/Documentation/git-cherry-pick.txt\n@@ -38,7 +38,7 @@ OPTIONS\n \tdevelopment branch), adding this information can be\n \tuseful.\n \n--r|--replay::\n+-r::\n \tIt used to be that the command defaulted to do `-x`\n \tdescribed above, and `-r` was to disable it. Now the\n \tdefault is not to do `-x` so this option is a no-op.\n-- \n1.5.1.1.116.g8c4c\n"},{"id":"39861","messageId":"20070419030331.GC19402@bowser.ruder","threadId":"7672","inReplyTo":"20070416053525.GA18821@localdomain","subject":"[PATCH] Fix unmatched emphasis tag in git-tutorial","fromName":"Andrew Ruder","fromEmail":"andy@aeruder.net","sentAt":"2007-04-19T03:03:31Z","receivedAt":"2007-04-19T03:03:31Z","isPatch":true,"sender":{"key":"andy@aeruder.net","avatar":"https://gravatar.com/avatar/cd5239f6d3c9acac61e817de7f7d497e518415e23720f170a10e0663a7981963?d=mp&s=160"},"body":"In asciidoc 7.1.2 and prior there is no obvious way to get:\n\n'add'ing\n\nto emphasize only the \"add\", instead it treats the first apostrophe as the\nbeginning of an emphasis, and the second apostrophe as a regular\napostrophe and makes the rest of the line an emphasis since there is no\nclosing apostrophe. In the newer asciidoc you can do it pretty easily\nwith __add__ing but I'm not sure it would be best to make that a prereq\nfor something as silly as this.\n\nSigned-off-by: Andrew Ruder \n---\n Documentation/tutorial.txt | 2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n\ndiff --git a/Documentation/tutorial.txt b/Documentation/tutorial.txt\nindex 129c5c5..e978562 100644\n--- a/Documentation/tutorial.txt\n+++ b/Documentation/tutorial.txt\n@@ -111,7 +111,7 @@ make it real.\n Note: don't forget to 'add' a file again if you modified it after the\n first 'add' and before 'commit'. Otherwise only the previous added\n state of that file will be committed. This is because git tracks\n-content, so what you're really 'add'ing to the commit is the *content*\n+content, so what you're really 'adding' to the commit is the *content*\n of the file in the state it is in when you 'add' it.\n \n 2) By using 'git commit -a' directly\n-- \n1.5.1.1.116.g8c4c\n"},{"id":"39859","messageId":"20070419030337.GD19402@bowser.ruder","threadId":"7672","inReplyTo":"20070416053525.GA18821@localdomain","subject":"[PATCH] Update git-config documentation","fromName":"Andrew Ruder","fromEmail":"andy@aeruder.net","sentAt":"2007-04-19T03:03:37Z","receivedAt":"2007-04-19T03:03:37Z","isPatch":true,"sender":{"key":"andy@aeruder.net","avatar":"https://gravatar.com/avatar/cd5239f6d3c9acac61e817de7f7d497e518415e23720f170a10e0663a7981963?d=mp&s=160"},"body":"Documentation/git-config.txt: Added documentation for --system\nDocumentation/builtin-config.c: Added --system to the short usage\n\nSigned-off-by: Andrew Ruder \n---\n Documentation/git-config.txt | 24 ++++++++++++++----------\n builtin-config.c | 2 +-\n 2 files changed, 15 insertions(+), 11 deletions(-)\n\ndiff --git a/Documentation/git-config.txt b/Documentation/git-config.txt\nindex c759efb..280ef20 100644\n--- a/Documentation/git-config.txt\n+++ b/Documentation/git-config.txt\n@@ -9,16 +9,16 @@ git-config - Get and set repository or global options\n SYNOPSIS\n --------\n [verse]\n-'git-config' [--global] [type] name [value [value_regex]]\n-'git-config' [--global] [type] --add name value\n-'git-config' [--global] [type] --replace-all name [value [value_regex]]\n-'git-config' [--global] [type] --get name [value_regex]\n-'git-config' [--global] [type] --get-all name [value_regex]\n-'git-config' [--global] [type] --unset name [value_regex]\n-'git-config' [--global] [type] --unset-all name [value_regex]\n-'git-config' [--global] [type] --rename-section old_name new_name\n-'git-config' [--global] [type] --remove-section name\n-'git-config' [--global] -l | --list\n+'git-config' [--system | --global] [type] name [value [value_regex]]\n+'git-config' [--system | --global] [type] --add name value\n+'git-config' [--system | --global] [type] --replace-all name [value [value_regex]]\n+'git-config' [--system | --global] [type] --get name [value_regex]\n+'git-config' [--system | --global] [type] --get-all name [value_regex]\n+'git-config' [--system | --global] [type] --unset name [value_regex]\n+'git-config' [--system | --global] [type] --unset-all name [value_regex]\n+'git-config' [--system | --global] [type] --rename-section old_name new_name\n+'git-config' [--system | --global] [type] --remove-section name\n+'git-config' [--system | --global] -l | --list\n \n DESCRIPTION\n -----------\n@@ -76,6 +76,10 @@ OPTIONS\n --global::\n \tUse global ~/.gitconfig file rather than the repository .git/config.\n \n+--system::\n+\tUse system-wide $(prefix)/etc/gitconfig rather than the repository\n+\t.git/config.\n+\n --remove-section::\n \tRemove the given section from the configuration file.\n \ndiff --git a/builtin-config.c b/builtin-config.c\nindex dfa403b..b2515f7 100644\n--- a/builtin-config.c\n+++ b/builtin-config.c\n@@ -2,7 +2,7 @@\n #include \"cache.h\"\n \n static const char git_config_set_usage[] =\n-\"git-config [ --global ] [ --bool | --int ] [--get | --get-all | --get-regexp | --replace-all | --add | --unset | --unset-all] name [value [value_regex]] | --rename-section old_name new_name | --remove-section name | --list\";\n+\"git-config [ --global | --system ] [ --bool | --int ] [--get | --get-all | --get-regexp | --replace-all | --add | --unset | --unset-all] name [value [value_regex]] | --rename-section old_name new_name | --remove-section name | --list\";\n \n static char *key;\n static regex_t *key_regexp;\n-- \n1.5.1.1.116.g8c4c\n"}]}