Misc doc improvements
Signed-off-by: Jonas Fonseca <fonseca@diku.dk> Signed-off-by: Junio C Hamano <junkio@cox.net>
Jonas Fonseca committed
Jun 7, 2006 at 20:32 UTC
74237d6236d7e32f69469ff26df3f3bb3875f523
3 files changed
+24
-4
Documentation/git-apply.txt
+1
-1
@@ -76,7 +76,7 @@ OPTIONS
76
-C<n>::
77
Ensure at least <n> lines of surrounding context match before
78
and after each change. When fewer lines of surrounding
79
- context exist they all most match. By default no context is
79
+ context exist they all must match. By default no context is
80
ever ignored.
81
82
--apply::
Documentation/git-shortlog.txt
+16
-3
@@ -5,7 +5,6 @@ NAME
5
----
6
git-shortlog - Summarize 'git log' output
7
8
-
8
SYNOPSIS
9
--------
10
git-log --pretty=short | 'git-shortlog'
@@ -13,8 +12,22 @@ git-log --pretty=short | 'git-shortlog'
12
DESCRIPTION
13
-----------
14
Summarizes 'git log' output in a format suitable for inclusion
16
-in release announcements.
17
-
15
+in release announcements. Each commit will be grouped by author
16
+the first line of the commit message will be shown.
17
+
18
+Additionally, "[PATCH]" will be stripped from the commit description.
19
+
20
+FILES
21
+-----
22
+'.mailmap'::
23
+ If this file exists, it will be used for mapping author email
24
+ addresses to a real author name. One mapping per line, first
25
+ the author name followed by the email address enclosed by
26
+ '<' and '>'. Use hash '#' for comments. Example:
27
+
28
+ # Keep alphabetized
29
+ Adam Morrow <adam@localhost.localdomain>
30
+ Eve Jones <eve@laptop.(none)>
31
32
Author
33
------
Documentation/glossary.txt
+7
@@ -109,6 +109,13 @@ file system::
109
git archive::
110
Synonym for repository (for arch people).
111
112
+grafts::
113
+ Grafts enables two otherwise different lines of development to be
114
+ joined together by recording fake ancestry information for commits.
115
+ This way you can make git pretend the set of parents a commit
116
+ has is different from what was recorded when the commit was created.
117
+ Configured via the `.git/info/grafts` file.
118
+
119
hash::
120
In git's context, synonym to object name.
121