{"thread":{"id":"4421","subject":"[PATCH] Misc doc improvements","startedAt":"2006-06-07T18:32:33Z","lastAt":"2006-06-07T18:46:03Z","messageCount":2,"participants":["Jonas Fonseca","Jakub Narebski"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"21389","messageId":"20060607183233.GA21448@diku.dk","threadId":"4421","inReplyTo":null,"subject":"[PATCH] Misc doc improvements","fromName":"Jonas Fonseca","fromEmail":"fonseca@diku.dk","sentAt":"2006-06-07T18:32:33Z","receivedAt":"2006-06-07T18:32:33Z","isPatch":true,"sender":{"key":"fonseca@diku.dk","avatar":"https://gravatar.com/avatar/f82f3ad698717c51873b020c750a92438c820a24056dc39fe4d07baa10a92264?d=mp&s=160"},"body":"Signed-off-by: Jonas Fonseca <fonseca@diku.dk>\n---\n Documentation/git-apply.txt    |    2 +-\n Documentation/git-shortlog.txt |   19 ++++++++++++++++---\n Documentation/glossary.txt     |    7 +++++++\n 3 files changed, 24 insertions(+), 4 deletions(-)\n\ndiff --git a/Documentation/git-apply.txt b/Documentation/git-apply.txt\nindex 9cc7c74..2ff7494 100644\n--- a/Documentation/git-apply.txt\n+++ b/Documentation/git-apply.txt\n@@ -76,7 +76,7 @@ OPTIONS\n -C<n>::\n \tEnsure at least <n> lines of surrounding context match before\n \tand after each change.  When fewer lines of surrounding\n-\tcontext exist they all most match.  By default no context is\n+\tcontext exist they all must match.  By default no context is\n \tever ignored.\n \n --apply::\ndiff --git a/Documentation/git-shortlog.txt b/Documentation/git-shortlog.txt\nindex 54fb922..0dbd3b2 100644\n--- a/Documentation/git-shortlog.txt\n+++ b/Documentation/git-shortlog.txt\n@@ -5,7 +5,6 @@ NAME\n ----\n git-shortlog - Summarize 'git log' output\n \n-\n SYNOPSIS\n --------\n git-log --pretty=short | 'git-shortlog'\n@@ -13,8 +12,22 @@ git-log --pretty=short | 'git-shortlog'\n DESCRIPTION\n -----------\n Summarizes 'git log' output in a format suitable for inclusion\n-in release announcements.\n-\n+in release announcements. Each commit will be grouped by author\n+the first line of the commit message will be shown.\n+\n+Additionally, \"[PATCH]\" will be stripped from the commit description.\n+\n+FILES\n+-----\n+'.mailcap'::\n+\tIf this file exists, it will be used for mapping author email\n+\taddresses to a real author name. One mapping per line, first\n+\tthe author name followed by the email address enclosed by\n+\t'<' and '>'. Use hash '#' for comments. Example:\n+\n+\t\t# Keep alphabetized\n+\t\tAdam Morrow <adam@localhost.localdomain>\n+\t\tEve Jones <eve@laptop.(none)>\n \n Author\n ------\ndiff --git a/Documentation/glossary.txt b/Documentation/glossary.txt\nindex 39c90ad..879c708 100644\n--- a/Documentation/glossary.txt\n+++ b/Documentation/glossary.txt\n@@ -109,6 +109,13 @@ file system::\n git archive::\n \tSynonym for repository (for arch people).\n \n+grafts::\n+\tGrafts enables two otherwise different lines of development to be\n+\tjoined together by recording fake ancestry information for commits.\n+\tThis way you can make git pretend the set of parents a commit\n+\thas is different from what was recorded when the commit was created.\n+\tConfigured via the `.git/info/grafts` file.\n+\n hash::\n \tIn git's context, synonym to object name.\n \n-- \n1.4.0.rc1.gfd4c-dirty\n-- \nJonas Fonseca\n"},{"id":"21393","messageId":"e676st$fpm$1@sea.gmane.org","threadId":"4421","inReplyTo":"20060607183233.GA21448@diku.dk","subject":"Re: [PATCH] Misc doc improvements","fromName":"Jakub Narebski","fromEmail":"jnareb@gmail.com","sentAt":"2006-06-07T18:46:03Z","receivedAt":"2006-06-07T18:46:03Z","isPatch":true,"sender":{"key":"jnareb@gmail.com","avatar":"https://avatars.githubusercontent.com/u/2706?v=4"},"body":"Jonas Fonseca wrote:\n\n> +grafts::\n> +     Grafts enables two otherwise different lines of development to be\n> +     joined together by recording fake ancestry information for commits.\n> +     This way you can make git pretend the set of parents a commit\n> +     has is different from what was recorded when the commit was created.\n> +     Configured via the `.git/info/grafts` file.\n\nActually, grafts are used to \"fake\" (or change) parents (ancestry) of an\nexisting commit. It can be used both to add parents (e.g. joining roots of\n\"current\" repository with historical one), or remove parents (e.g. to\nshorten (cauterize) history like in the \"shalllow clone\" idea).\n\n-- \nJakub Narebski\nWarsaw, Poland\n"}]}