diff options
author | Junio C Hamano <junkio@cox.net> | 2006-06-07 17:27:09 -0700 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2006-06-07 17:27:09 -0700 |
commit | ab1b3af7925682e0375667b892e2f7e985effba5 (patch) | |
tree | 3f2cdfe4fc3f15e385cf9ba00f06dc6bddf80943 /Documentation/git-shortlog.txt | |
parent | Merge branch 'master' into next (diff) | |
parent | Documentation: git aliases (diff) | |
download | tgif-ab1b3af7925682e0375667b892e2f7e985effba5.tar.xz |
Merge branch 'master' into next
* master:
Documentation: git aliases
git-cvsserver asciidoc formatting tweaks
config.txt grammar, typo, and asciidoc fixes
Documentation: git-ls-tree (typofix)
Document git-ls-tree --fullname
Document git aliases support
make clean: remove dist-doc targets.
Misc doc improvements
Documentation: add missing docs make check-docs found.
Some doc typo fixes
Off-by-one error in get_path_prefix(), found by Valgrind
gitk: Re-read the descendent/ancestor tag & head info on update
Diffstat (limited to 'Documentation/git-shortlog.txt')
-rw-r--r-- | Documentation/git-shortlog.txt | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/Documentation/git-shortlog.txt b/Documentation/git-shortlog.txt index 54fb922ba9..7486ebe785 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 ------ |