summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJonas Fonseca <fonseca@diku.dk>2006-06-07 18:32:33 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-06-07 19:37:46 (GMT)
commit74237d6236d7e32f69469ff26df3f3bb3875f523 (patch)
treede5abe163180aa34f16406197ff8be5f26a068ba /Documentation
parent34925d35ff278c7377e0cf3fce0227d5eceffeb5 (diff)
downloadgit-74237d6236d7e32f69469ff26df3f3bb3875f523.zip
git-74237d6236d7e32f69469ff26df3f3bb3875f523.tar.gz
git-74237d6236d7e32f69469ff26df3f3bb3875f523.tar.bz2
Misc doc improvements
Signed-off-by: Jonas Fonseca <fonseca@diku.dk> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-apply.txt2
-rw-r--r--Documentation/git-shortlog.txt19
-rw-r--r--Documentation/glossary.txt7
3 files changed, 24 insertions, 4 deletions
diff --git a/Documentation/git-apply.txt b/Documentation/git-apply.txt
index 9cc7c74..2ff7494 100644
--- a/Documentation/git-apply.txt
+++ b/Documentation/git-apply.txt
@@ -76,7 +76,7 @@ OPTIONS
-C<n>::
Ensure at least <n> lines of surrounding context match before
and after each change. When fewer lines of surrounding
- context exist they all most match. By default no context is
+ context exist they all must match. By default no context is
ever ignored.
--apply::
diff --git a/Documentation/git-shortlog.txt b/Documentation/git-shortlog.txt
index 54fb922..7486ebe 100644
--- a/Documentation/git-shortlog.txt
+++ b/Documentation/git-shortlog.txt
@@ -5,7 +5,6 @@ NAME
----
git-shortlog - Summarize 'git log' output
-
SYNOPSIS
--------
git-log --pretty=short | 'git-shortlog'
@@ -13,8 +12,22 @@ git-log --pretty=short | 'git-shortlog'
DESCRIPTION
-----------
Summarizes 'git log' output in a format suitable for inclusion
-in release announcements.
-
+in release announcements. Each commit will be grouped by author
+the first line of the commit message will be shown.
+
+Additionally, "[PATCH]" will be stripped from the commit description.
+
+FILES
+-----
+'.mailmap'::
+ If this file exists, it will be used for mapping author email
+ addresses to a real author name. One mapping per line, first
+ the author name followed by the email address enclosed by
+ '<' and '>'. Use hash '#' for comments. Example:
+
+ # Keep alphabetized
+ Adam Morrow <adam@localhost.localdomain>
+ Eve Jones <eve@laptop.(none)>
Author
------
diff --git a/Documentation/glossary.txt b/Documentation/glossary.txt
index 39c90ad..116ddb7 100644
--- a/Documentation/glossary.txt
+++ b/Documentation/glossary.txt
@@ -109,6 +109,13 @@ file system::
git archive::
Synonym for repository (for arch people).
+grafts::
+ Grafts enables two otherwise different lines of development to be
+ joined together by recording fake ancestry information for commits.
+ This way you can make git pretend the set of parents a commit
+ has is different from what was recorded when the commit was created.
+ Configured via the `.git/info/grafts` file.
+
hash::
In git's context, synonym to object name.