{"thread":{"id":"7866","subject":"[PATCH 1/8] Removing -n option from git-diff-files documentation","startedAt":"2007-04-27T05:05:50Z","lastAt":"2007-04-29T07:05:17Z","messageCount":10,"participants":["Andrew Ruder","Petr Baudis","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":8},"messages":[{"id":"40565","messageId":"20070427050550.GA9594@bowser.ruder","threadId":"7866","inReplyTo":null,"subject":"[PATCH 1/8] Removing -n option from git-diff-files documentation","fromName":"Andrew Ruder","fromEmail":"andy@aeruder.net","sentAt":"2007-04-27T05:05:50Z","receivedAt":"2007-04-27T05:05:50Z","isPatch":true,"sender":{"key":"andy@aeruder.net","avatar":"https://gravatar.com/avatar/cd5239f6d3c9acac61e817de7f7d497e518415e23720f170a10e0663a7981963?d=mp&s=160"},"body":"-n is not a short form of --no-index as the documentation\nsuggests.  Removing it from the documentation and command\nusage string.\n\nSigned-off-by: Andrew Ruder <andy@aeruder.net>\n---\n Documentation/git-diff-files.txt |    4 ++--\n builtin-diff-files.c             |    2 +-\n 2 files changed, 3 insertions(+), 3 deletions(-)\n\ndiff --git a/Documentation/git-diff-files.txt b/Documentation/git-diff-files.txt\nindex b78c4c6..2e1e29e 100644\n--- a/Documentation/git-diff-files.txt\n+++ b/Documentation/git-diff-files.txt\n@@ -8,7 +8,7 @@ git-diff-files - Compares files in the working tree and the index\n \n SYNOPSIS\n --------\n-'git-diff-files' [-q] [-0|-1|-2|-3|-c|--cc|-n|--no-index] [<common diff options>] [<path>...]\n+'git-diff-files' [-q] [-0|-1|-2|-3|-c|--cc|--no-index] [<common diff options>] [<path>...]\n \n DESCRIPTION\n -----------\n@@ -36,7 +36,7 @@ omit diff output for unmerged entries and just show \"Unmerged\".\n \tdiff, similar to the way 'diff-tree' shows a merge\n \tcommit with these flags.\n \n-\\-n,\\--no-index::\n+--no-index::\n \tCompare the two given files / directories.\n \n -q::\ndiff --git a/builtin-diff-files.c b/builtin-diff-files.c\nindex 6ba5077..6cb30c8 100644\n--- a/builtin-diff-files.c\n+++ b/builtin-diff-files.c\n@@ -10,7 +10,7 @@\n #include \"builtin.h\"\n \n static const char diff_files_usage[] =\n-\"git-diff-files [-q] [-0/-1/2/3 |-c|--cc|-n|--no-index] [<common diff options>] [<path>...]\"\n+\"git-diff-files [-q] [-0/-1/2/3 |-c|--cc|--no-index] [<common diff options>] [<path>...]\"\n COMMON_DIFF_OPTIONS_HELP;\n \n int cmd_diff_files(int argc, const char **argv, const char *prefix)\n-- \n1.5.2.rc0.64.g8476\n"},{"id":"40566","messageId":"20070427050915.GA9798@bowser.ruder","threadId":"7866","inReplyTo":"20070427050550.GA9594@bowser.ruder","subject":"[PATCH 2/8] Document additional options for git-fetch","fromName":"Andrew Ruder","fromEmail":"andy@aeruder.net","sentAt":"2007-04-27T05:09:15Z","receivedAt":"2007-04-27T05:09:15Z","isPatch":true,"sender":{"key":"andy@aeruder.net","avatar":"https://gravatar.com/avatar/cd5239f6d3c9acac61e817de7f7d497e518415e23720f170a10e0663a7981963?d=mp&s=160"},"body":"Document --quiet/-q and --verbose/-v\nAdd -n as an alternate for --no-tags\nFix some whitespace issues\n\nSigned-off-by: Andrew Ruder <andy@aeruder.net>\n---\n Documentation/fetch-options.txt |   17 ++++++++++++-----\n 1 files changed, 12 insertions(+), 5 deletions(-)\n\ndiff --git a/Documentation/fetch-options.txt b/Documentation/fetch-options.txt\nindex 5b4d184..bdc7332 100644\n--- a/Documentation/fetch-options.txt\n+++ b/Documentation/fetch-options.txt\n@@ -1,13 +1,20 @@\n+-q, \\--quiet::\n+\tPass --quiet to git-fetch-pack and silence any other internally\n+\tused programs.\n+\n+-v, \\--verbose::\n+\tBe verbose.\n+\n -a, \\--append::\n \tAppend ref names and object names of fetched refs to the\n \texisting contents of `.git/FETCH_HEAD`.  Without this\n \toption old data in `.git/FETCH_HEAD` will be overwritten.\n \n \\--upload-pack <upload-pack>::\n-        When given, and the repository to fetch from is handled\n-        by 'git-fetch-pack', '--exec=<upload-pack>' is passed to\n-        the command to specify non-default path for the command\n-        run on the other end.\n+\tWhen given, and the repository to fetch from is handled\n+\tby 'git-fetch-pack', '--exec=<upload-pack>' is passed to\n+\tthe command to specify non-default path for the command\n+\trun on the other end.\n \n -f, \\--force::\n \tWhen `git-fetch` is used with `<rbranch>:<lbranch>`\n@@ -16,7 +23,7 @@\n \tfetches is a descendant of `<lbranch>`.  This option\n \toverrides that check.\n \n-\\--no-tags::\n+-n, \\--no-tags::\n \tBy default, `git-fetch` fetches tags that point at\n \tobjects that are downloaded from the remote repository\n \tand stores them locally.  This option disables this\n-- \n1.5.2.rc0.64.g8476\n"},{"id":"40568","messageId":"20070427050920.GB9798@bowser.ruder","threadId":"7866","inReplyTo":"20070427050550.GA9594@bowser.ruder","subject":"[PATCH 3/8] Update git-fmt-merge documentation","fromName":"Andrew Ruder","fromEmail":"andy@aeruder.net","sentAt":"2007-04-27T05:09:20Z","receivedAt":"2007-04-27T05:09:20Z","isPatch":true,"sender":{"key":"andy@aeruder.net","avatar":"https://gravatar.com/avatar/cd5239f6d3c9acac61e817de7f7d497e518415e23720f170a10e0663a7981963?d=mp&s=160"},"body":"Documentation/git-fmt-merge-msg.txt:\n\t--summary to list commit summaries on merge\n\t--no-summary\n\t--file to take merged objects from a file.\n\tConfiguration option merge.summary\n\nSigned-off-by: Andrew Ruder <andy@aeruder.net>\n---\n Documentation/git-fmt-merge-msg.txt |   25 ++++++++++++++++++++++++-\n 1 files changed, 24 insertions(+), 1 deletions(-)\n\ndiff --git a/Documentation/git-fmt-merge-msg.txt b/Documentation/git-fmt-merge-msg.txt\nindex a70eb39..e560b30 100644\n--- a/Documentation/git-fmt-merge-msg.txt\n+++ b/Documentation/git-fmt-merge-msg.txt\n@@ -8,7 +8,8 @@ git-fmt-merge-msg - Produce a merge commit message\n \n SYNOPSIS\n --------\n-'git-fmt-merge-msg' <$GIT_DIR/FETCH_HEAD\n+git-fmt-merge-msg [--summary | --no-summary] <$GIT_DIR/FETCH_HEAD\n+git-fmt-merge-msg [--summary | --no-summray] -F <file>\n \n DESCRIPTION\n -----------\n@@ -19,6 +20,28 @@ passed as the '<merge-message>' argument of `git-merge`.\n This script is intended mostly for internal use by scripts\n automatically invoking `git-merge`.\n \n+OPTIONS\n+-------\n+\n+--summary::\n+\tIn addition to branch names, populate the log message with\n+\tone-line descriptions from the actual commits that are being\n+\tmerged.\n+\n+--no-summary::\n+\tDo not list one-line descriptions from the actual commits being\n+\tmerged.\n+\n+--file <file>, -F <file>::\n+\tTake the list of merged objects from <file> instead of\n+\tstdin.\n+\n+CONFIGURATION\n+-------------\n+\n+merge.summary::\n+\tWhether to include summaries of merged commits in newly\n+\tmerge commit messages. False by default.\n \n SEE ALSO\n --------\n-- \n1.5.2.rc0.64.g8476\n"},{"id":"40567","messageId":"20070427050926.GC9798@bowser.ruder","threadId":"7866","inReplyTo":"20070427050550.GA9594@bowser.ruder","subject":"[PATCH 4/8] Update git-grep documentation","fromName":"Andrew Ruder","fromEmail":"andy@aeruder.net","sentAt":"2007-04-27T05:09:26Z","receivedAt":"2007-04-27T05:09:26Z","isPatch":true,"sender":{"key":"andy@aeruder.net","avatar":"https://gravatar.com/avatar/cd5239f6d3c9acac61e817de7f7d497e518415e23720f170a10e0663a7981963?d=mp&s=160"},"body":"Documentation/git-grep.txt: Document -F/--fixed-strings to\nsearch for non-regexp patterns.  Document -I to not search\nbinary files.  Document -<num> as a shortcut for -C<num>.\n\nSigned-off-by: Andrew Ruder <andy@aeruder.net>\n---\n Documentation/git-grep.txt |   19 +++++++++++++++----\n 1 files changed, 15 insertions(+), 4 deletions(-)\n\ndiff --git a/Documentation/git-grep.txt b/Documentation/git-grep.txt\nindex 0140c8e..c5a5dad 100644\n--- a/Documentation/git-grep.txt\n+++ b/Documentation/git-grep.txt\n@@ -12,12 +12,13 @@ SYNOPSIS\n 'git-grep' [--cached]\n \t   [-a | --text] [-I] [-i | --ignore-case] [-w | --word-regexp]\n \t   [-v | --invert-match] [-h|-H] [--full-name]\n-\t   [-E | --extended-regexp] [-G | --basic-regexp] [-F | --fixed-strings]\n-\t   [-n] [-l | --files-with-matches] [-L | --files-without-match]\n+\t   [-E | --extended-regexp] [-G | --basic-regexp]\n+\t   [-F | --fixed-strings] [-n]\n+\t   [-l | --files-with-matches] [-L | --files-without-match]\n \t   [-c | --count] [--all-match]\n \t   [-A <post-context>] [-B <pre-context>] [-C <context>]\n-\t   [-f <file>] [-e] <pattern> [--and|--or|--not|(|)|-e <pattern>...]\n-\t   [<tree>...]\n+\t   [-f <file>] [-e] <pattern>\n+\t   [--and|--or|--not|(|)|-e <pattern>...] [<tree>...]\n \t   [--] [<path>...]\n \n DESCRIPTION\n@@ -39,6 +40,9 @@ OPTIONS\n \tIgnore case differences between the patterns and the\n \tfiles.\n \n+-I::\n+\tDon't match the pattern in binary files.\n+\n -w | --word-regexp::\n \tMatch the pattern only at word boundary (either begin at the\n \tbeginning of a line, or preceded by a non-word character; end at\n@@ -64,6 +68,10 @@ OPTIONS\n \tUse POSIX extended/basic regexp for patterns.  Default\n \tis to use basic regexp.\n \n+-F | --fixed-strings::\n+\tUse fixed strings for patterns (don't interpret pattern\n+\tas a regex).\n+\n -n::\n \tPrefix the line number to matching lines.\n \n@@ -81,6 +89,9 @@ OPTIONS\n \tline containing `--` between contiguous groups of\n \tmatches.\n \n+-<num>::\n+\tA shortcut for specifying -C<num>.\n+\n -f <file>::\n \tRead patterns from <file>, one per line.\n \n-- \n1.5.2.rc0.64.g8476\n"},{"id":"40569","messageId":"20070427050949.GD9798@bowser.ruder","threadId":"7866","inReplyTo":"20070427050550.GA9594@bowser.ruder","subject":"[PATCH 5/8] Update -L documentation for git-blame/git-annotate","fromName":"Andrew Ruder","fromEmail":"andy@aeruder.net","sentAt":"2007-04-27T05:09:49Z","receivedAt":"2007-04-27T05:09:49Z","isPatch":true,"sender":{"key":"andy@aeruder.net","avatar":"https://gravatar.com/avatar/cd5239f6d3c9acac61e817de7f7d497e518415e23720f170a10e0663a7981963?d=mp&s=160"},"body":"Documenting alternate ways to use -L:\n\n-L /regex/,end\n-L start,+offset\n\nSigned-off-by: Andrew Ruder <andy@aeruder.net>\n---\n Documentation/blame-options.txt |   24 ++++++++++++++++++++++--\n 1 files changed, 22 insertions(+), 2 deletions(-)\n\ndiff --git a/Documentation/blame-options.txt b/Documentation/blame-options.txt\nindex 331f161..0099bb2 100644\n--- a/Documentation/blame-options.txt\n+++ b/Documentation/blame-options.txt\n@@ -9,8 +9,28 @@\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+-L <start>,<end>::\n+\tAnnotate only the given line range.  <start> and <end> can take\n+\tone of these forms:\n+\n+\t- number\n++\n+\tIf <start> or <end> 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 <end> is a regex, it will search\n+\tstarting at the line given by <start>.\n++\n+\n+\t- +offset or -offset\n++\n+\tThis is only valid for <end> and will specify a number\n+\tof lines before or after the line given by <start>.\n++\n \n -l::\n \tShow long rev (Default: off).\n-- \n1.5.2.rc0.64.g8476\n"},{"id":"40570","messageId":"20070427050953.GE9798@bowser.ruder","threadId":"7866","inReplyTo":"20070427050550.GA9594@bowser.ruder","subject":"[PATCH 6/8] Update git-http-push documentation","fromName":"Andrew Ruder","fromEmail":"andy@aeruder.net","sentAt":"2007-04-27T05:09:53Z","receivedAt":"2007-04-27T05:09:53Z","isPatch":true,"sender":{"key":"andy@aeruder.net","avatar":"https://gravatar.com/avatar/cd5239f6d3c9acac61e817de7f7d497e518415e23720f170a10e0663a7981963?d=mp&s=160"},"body":"Documentation/git-http-push.txt: Changing --complete to --all.  Added\ndocumentation for -d and -D to remote remote refs.\n\nSigned-off-by: Andrew Ruder <andy@aeruder.net>\n---\n Documentation/git-http-push.txt |   13 +++++++++++--\n 1 files changed, 11 insertions(+), 2 deletions(-)\n\ndiff --git a/Documentation/git-http-push.txt b/Documentation/git-http-push.txt\nindex 4b4a461..a15cf5b 100644\n--- a/Documentation/git-http-push.txt\n+++ b/Documentation/git-http-push.txt\n@@ -8,7 +8,7 @@ git-http-push - Push objects over HTTP/DAV to another repository\n \n SYNOPSIS\n --------\n-'git-http-push' [--complete] [--force] [--verbose] <url> <ref> [<ref>...]\n+'git-http-push' [--all] [--force] [--verbose] <url> <ref> [<ref>...]\n \n DESCRIPTION\n -----------\n@@ -18,7 +18,7 @@ remote branch.\n \n OPTIONS\n -------\n---complete::\n+--all::\n \tDo not assume that the remote repository is complete in its\n \tcurrent state, and verify all objects in the entire local\n \tref's history exist in the remote repository.\n@@ -34,6 +34,15 @@ OPTIONS\n \tReport the list of objects being walked locally and the\n \tlist of objects successfully sent to the remote repository.\n \n+-d, -D::\n+\tRemove <ref> from remote repository.  The specified branch\n+\tcannot be the remote HEAD.  If -d is specified the following\n+\tother conditions must also be met:\n+\n+\t- Remote HEAD must resolve to an object that exists locally\n+\t- Specified branch resolves to an object that exists locally\n+\t- Specified branch is an ancestor of the remote HEAD\n+\n <ref>...::\n \tThe remote refs to update.\n \n-- \n1.5.2.rc0.64.g8476\n"},{"id":"40571","messageId":"20070427050958.GF9798@bowser.ruder","threadId":"7866","inReplyTo":"20070427050550.GA9594@bowser.ruder","subject":"[PATCH 7/8] Update git-local-fetch documentation","fromName":"Andrew Ruder","fromEmail":"andy@aeruder.net","sentAt":"2007-04-27T05:09:58Z","receivedAt":"2007-04-27T05:09:58Z","isPatch":true,"sender":{"key":"andy@aeruder.net","avatar":"https://gravatar.com/avatar/cd5239f6d3c9acac61e817de7f7d497e518415e23720f170a10e0663a7981963?d=mp&s=160"},"body":"Documentation/git-local-fetch.txt: -s to use\nsymbolic links instead of file-to-file copy, -l\nto use hardlinks, -n to never use file-to-file\ncopies, --recover to resume a failed fetch.\n\nSigned-off-by: Andrew Ruder <andy@aeruder.net>\n---\n Documentation/git-local-fetch.txt |   14 ++++++++++++++\n 1 files changed, 14 insertions(+), 0 deletions(-)\n\ndiff --git a/Documentation/git-local-fetch.txt b/Documentation/git-local-fetch.txt\nindex 22048d8..dd9e238 100644\n--- a/Documentation/git-local-fetch.txt\n+++ b/Documentation/git-local-fetch.txt\n@@ -24,6 +24,16 @@ OPTIONS\n \tGet all the objects.\n -v::\n \tReport what is downloaded.\n+-s::\n+\tInstead of regular file-to-file copying use symbolic links to the objects\n+\tin the remote repository.\n+-l::\n+\tBefore attempting symlinks (if -s is specified) or file-to-file copying the\n+\tremote objects, try to hardlink the remote objects into the local\n+\trepository.\n+-n::\n+\tNever attempt to file-to-file copy remote objects.  Only useful with\n+\t-s or -l command-line options.\n \n -w <filename>::\n         Writes the commit-id into the filename under $GIT_DIR/refs/<filename> on\n@@ -35,6 +45,10 @@ OPTIONS\n \n \t\t<commit-id>['\\t'<filename-as-in--w>]\n \n+--recover::\n+\tVerify that everything reachable from target is fetched.  Used after\n+\tan earlier fetch is interrupted.\n+\n Author\n ------\n Written by Junio C Hamano <junkio@cox.net>\n-- \n1.5.2.rc0.64.g8476\n"},{"id":"40572","messageId":"20070427051002.GG9798@bowser.ruder","threadId":"7866","inReplyTo":"20070427050550.GA9594@bowser.ruder","subject":"[PATCH 8/8] Update git-http-fetch documentation","fromName":"Andrew Ruder","fromEmail":"andy@aeruder.net","sentAt":"2007-04-27T05:10:03Z","receivedAt":"2007-04-27T05:10:03Z","isPatch":true,"sender":{"key":"andy@aeruder.net","avatar":"https://gravatar.com/avatar/cd5239f6d3c9acac61e817de7f7d497e518415e23720f170a10e0663a7981963?d=mp&s=160"},"body":"Documentation/git-http-fetch.txt: --recover to resume a failed fetch\noperation.\n\nSigned-off-by: Andrew Ruder <andy@aeruder.net>\n---\n Documentation/git-http-fetch.txt |    4 ++++\n 1 files changed, 4 insertions(+), 0 deletions(-)\n\ndiff --git a/Documentation/git-http-fetch.txt b/Documentation/git-http-fetch.txt\nindex 7dc2df3..4deabc3 100644\n--- a/Documentation/git-http-fetch.txt\n+++ b/Documentation/git-http-fetch.txt\n@@ -39,6 +39,10 @@ commit-id::\n \n \t\t<commit-id>['\\t'<filename-as-in--w>]\n \n+--recover::\n+\tVerify that everything reachable from target is fetched.  Used after\n+\tan earlier fetch is interrupted.\n+\n Author\n ------\n Written by Linus Torvalds <torvalds@osdl.org>\n-- \n1.5.2.rc0.64.g8476\n"},{"id":"40617","messageId":"20070427180523.GB4489@pasky.or.cz","threadId":"7866","inReplyTo":"20070427050550.GA9594@bowser.ruder","subject":"Re: [PATCH 1/8] Removing -n option from git-diff-files documentation","fromName":"Petr Baudis","fromEmail":"pasky@suse.cz","sentAt":"2007-04-27T18:05:23Z","receivedAt":"2007-04-27T18:05:23Z","isPatch":true,"sender":{"key":"pasky@ucw.cz","avatar":"https://avatars.githubusercontent.com/u/18439?v=4"},"body":"On Fri, Apr 27, 2007 at 07:05:50AM CEST, Andrew Ruder wrote:\n> -n is not a short form of --no-index as the documentation\n> suggests.  Removing it from the documentation and command\n> usage string.\n\nNevertheless, git-diff-files does accept -n, apparently to limit the\nnumber of outputted entries or something. Where is it documented?\n\n-- \n\t\t\t\tPetr \"Pasky\" Baudis\nStuff: http://pasky.or.cz/\nEver try. Ever fail. No matter. // Try again. Fail again. Fail better.\n\t\t-- Samuel Beckett\n"},{"id":"40697","messageId":"7vtzuzek42.fsf@assigned-by-dhcp.cox.net","threadId":"7866","inReplyTo":"20070427180523.GB4489@pasky.or.cz","subject":"Re: [PATCH 1/8] Removing -n option from git-diff-files documentation","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2007-04-29T07:05:17Z","receivedAt":"2007-04-29T07:05:17Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Petr Baudis <pasky@suse.cz> writes:\n\n> On Fri, Apr 27, 2007 at 07:05:50AM CEST, Andrew Ruder wrote:\n>> -n is not a short form of --no-index as the documentation\n>> suggests.  Removing it from the documentation and command\n>> usage string.\n>\n> Nevertheless, git-diff-files does accept -n, apparently to limit the\n> number of outputted entries or something. Where is it documented?\n\nIt is not \"accept\" but more like \"absorb and ignore\".  We\n(ab)use the option parser from revision traversal machinery when\nparsing \"git-diff\" options, but obviously options such as\nmax-count that relate to commit limiting do not have any meaning\nto \"git-diff-files\" or \"git-diff\".\n"}]}