{"thread":{"id":"2257","subject":"[PATCH] Documentation changes to recursive option for git-diff-tree","startedAt":"2005-10-28T17:04:49Z","lastAt":"2005-10-29T16:53:55Z","messageCount":4,"participants":["Chris Shoemaker","Junio C Hamano","H. Peter Anvin"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"10761","messageId":"20051028170449.GA1446@pe.Belkin","threadId":"2257","inReplyTo":null,"subject":"[PATCH] Documentation changes to recursive option for git-diff-tree","fromName":"Chris Shoemaker","fromEmail":"c.shoemaker@cox.net","sentAt":"2005-10-28T17:04:49Z","receivedAt":"2005-10-28T17:04:49Z","isPatch":true,"sender":{"key":"c.shoemaker@cox.net","avatar":null},"body":"Subject: [PATCH] Documentation changes to recursive option for git-diff-tree\n\n    Update docs and usages regarding '-r' recursive option for git-diff-tree.\n    Remove '-r' from common diff options, mention it only for git-diff-tree.\n    Remove one extraneous use of '-r' with git-diff-files in get-merge.sh.\n    Sync the synopsis and usage string for git-diff-tree.\n\nSigned-off-by: Chris Shoemaker <c.shoemaker at cox.net>\n\n---\nMy first real patch with git.  Did I do it right?\n\n-chris \n\n Documentation/git-diff-tree.txt |    5 ++++-\n diff-tree.c                     |    6 ++++--\n diff.h                          |    1 -\n git-merge.sh                    |    2 +-\n 4 files changed, 9 insertions(+), 5 deletions(-)\n\n4b20f7c39762c54c414eb92d17180064c7ccbde9\ndiff --git a/Documentation/git-diff-tree.txt b/Documentation/git-diff-tree.txt\n--- a/Documentation/git-diff-tree.txt\n+++ b/Documentation/git-diff-tree.txt\n@@ -8,7 +8,7 @@ git-diff-tree - Compares the content and\n \n SYNOPSIS\n --------\n-'git-diff-tree' [--stdin] [-m] [-s] [-v] [--pretty] [-t] [<common diff options>] <tree-ish> [<tree-ish>] [<path>...]\n+'git-diff-tree' [--stdin] [-m] [-s] [-v] [--pretty] [-t] [-r] [--root] [<common diff options>] <tree-ish> [<tree-ish>] [<path>...]\n \n DESCRIPTION\n -----------\n@@ -33,6 +33,9 @@ include::diff-options.txt[]\n \tNote that this parameter does not provide any wildcard or regexp\n \tfeatures.\n \n+-r::\n+        recurse into sub-trees\n+\n -t::\n \tshow tree entry itself as well as subtrees.  Implies -r.\n \ndiff --git a/diff-tree.c b/diff-tree.c\n--- a/diff-tree.c\n+++ b/diff-tree.c\n@@ -149,8 +149,10 @@ static int diff_tree_stdin(char *line)\n }\n \n static const char diff_tree_usage[] =\n-\"git-diff-tree [--stdin] [-m] [-s] [-v] [--pretty] [-t] \"\n-\"[<common diff options>] <tree-ish> <tree-ish>\"\n+\"git-diff-tree [--stdin] [-m] [-s] [-v] [--pretty] [-t] [-r] [--root] \"\n+\"[<common diff options>] <tree-ish> [<tree-ish>] [<path>...]\\n\"\n+\"  -r            diff recursively\\n\"\n+\"  --root        include the initial commit as diff against /dev/null\\n\"\n COMMON_DIFF_OPTIONS_HELP;\n \n int main(int argc, const char **argv)\ndiff --git a/diff.h b/diff.h\n--- a/diff.h\n+++ b/diff.h\n@@ -91,7 +91,6 @@ extern void diffcore_std_no_resolve(stru\n \n #define COMMON_DIFF_OPTIONS_HELP \\\n \"\\ncommon diff options:\\n\" \\\n-\"  -r            diff recursively (only meaningful in diff-tree)\\n\" \\\n \"  -z            output diff-raw with lines terminated with NUL.\\n\" \\\n \"  -p            output patch format.\\n\" \\\n \"  -u            synonym for -p.\\n\" \\\ndiff --git a/git-merge.sh b/git-merge.sh\n--- a/git-merge.sh\n+++ b/git-merge.sh\n@@ -25,7 +25,7 @@ dropsave() {\n \n savestate() {\n \t# Stash away any local modifications.\n-\tgit-diff-index -r -z --name-only $head |\n+\tgit-diff-index -z --name-only $head |\n \tcpio -0 -o >\"$GIT_DIR/MERGE_SAVE\"\n }\n \n"},{"id":"10788","messageId":"7vy84c291u.fsf@assigned-by-dhcp.cox.net","threadId":"2257","inReplyTo":"20051028170449.GA1446@pe.Belkin","subject":"Re: [PATCH] Documentation changes to recursive option for git-diff-tree","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2005-10-29T05:20:45Z","receivedAt":"2005-10-29T05:20:45Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"I already took some patches from you, but I just noticed this...\n\nChris Shoemaker <c.shoemaker@cox.net> writes:\n\n> Signed-off-by: Chris Shoemaker <c.shoemaker at cox.net>\n\nI do not particularly like this spelling out \"at\".\n"},{"id":"10791","messageId":"4363A25A.1030804@zytor.com","threadId":"2257","inReplyTo":"7vy84c291u.fsf@assigned-by-dhcp.cox.net","subject":"Re: [PATCH] Documentation changes to recursive option for git-diff-tree","fromName":"H. Peter Anvin","fromEmail":"hpa@zytor.com","sentAt":"2005-10-29T16:24:58Z","receivedAt":"2005-10-29T16:24:58Z","isPatch":true,"sender":{"key":"hpa@zytor.com","avatar":null},"body":"Junio C Hamano wrote:\n> I already took some patches from you, but I just noticed this...\n> \n> Chris Shoemaker <c.shoemaker@cox.net> writes:\n> \n> \n>>Signed-off-by: Chris Shoemaker <c.shoemaker at cox.net>\n> \n> \n> I do not particularly like this spelling out \"at\".\n> \n\nIt also doesn't do any good.  Spam harvesters have caught onto this one \na long time ago.\n\t\n\t-hpa\n"},{"id":"10793","messageId":"20051029165355.GB20990@pe.Belkin","threadId":"2257","inReplyTo":"7vy84c291u.fsf@assigned-by-dhcp.cox.net","subject":"Re: [PATCH] Documentation changes to recursive option for git-diff-tree","fromName":"Chris Shoemaker","fromEmail":"c.shoemaker@cox.net","sentAt":"2005-10-29T16:53:55Z","receivedAt":"2005-10-29T16:53:55Z","isPatch":true,"sender":{"key":"c.shoemaker@cox.net","avatar":null},"body":"On Fri, Oct 28, 2005 at 10:20:45PM -0700, Junio C Hamano wrote:\n> I already took some patches from you, but I just noticed this...\n> \n> Chris Shoemaker <c.shoemaker@cox.net> writes:\n> \n> > Signed-off-by: Chris Shoemaker <c.shoemaker at cox.net>\n> \n> I do not particularly like this spelling out \"at\".\n\nThat resulted from GIT_AUTHOR_IDENT=\"c.shoemaker<at>cox.net\".  I think\nI copied that format from somewhere, but I see now that the logs\ncontain regular addresses.  I've changed it to just\n\"c.shoemaker@cox.net\".\n\n-chris\n\n> \n> \n"}]}