mirror of
https://github.com/git/git
synced 2024-08-28 12:09:19 +00:00
Misc doc improvements
Signed-off-by: Jonas Fonseca <fonseca@diku.dk> Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
parent
34925d35ff
commit
74237d6236
|
@ -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::
|
||||
|
|
|
@ -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
|
||||
------
|
||||
|
|
|
@ -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.
|
||||
|
||||
|
|
Loading…
Reference in a new issue