diff options
| author |  Junio C Hamano <junkio@cox.net> | 2007-04-18 16:17:28 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-04-18 16:17:28 -0700 |
| commit | 6fb8e8f401a065bdffe379764871551e37a041a0 (patch) | |
| tree | 96f41d575c40cecd61f20254c327c3a03fc7044b /Documentation | |
| parent | Merge branch 'fl/cvsserver' (diff) | |
| parent | git-shortlog: Fix two formatting errors in asciidoc documentation (diff) | |
| download | tgif-6fb8e8f401a065bdffe379764871551e37a041a0.tar.xz | |
Merge branch 'maint'
* maint:
git-shortlog: Fix two formatting errors in asciidoc documentation
Fix overwriting of files when applying contextually independent diffs
git-svn: don't allow globs to match regular files
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/RelNotes-1.5.1.1.txt | 4 | ||||
| -rw-r--r-- | Documentation/git-shortlog.txt | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/Documentation/RelNotes-1.5.1.1.txt b/Documentation/RelNotes-1.5.1.1.txt index 3054b5a3f0..91471213bd 100644 --- a/Documentation/RelNotes-1.5.1.1.txt +++ b/Documentation/RelNotes-1.5.1.1.txt @@ -59,3 +59,7 @@ Fixes since v1.5.1 - git-svn dcommit and rebase was confused by patches that were merged from another branch that is managed by git-svn. + + - git-svn used to get confused when globbing remote branch/tag + spec (e.g. "branches = proj/branches/*:refs/remotes/origin/*") + is used and there was a plain file that matched the glob. diff --git a/Documentation/git-shortlog.txt b/Documentation/git-shortlog.txt index b0df92e819..1c8c55ef6e 100644 --- a/Documentation/git-shortlog.txt +++ b/Documentation/git-shortlog.txt @@ -7,6 +7,7 @@ git-shortlog - Summarize 'git log' output SYNOPSIS -------- +[verse] git-log --pretty=short | 'git-shortlog' [-h] [-n] [-s] git-shortlog [-n|--number] [-s|--summary] [<committish>...] @@ -33,7 +34,8 @@ OPTIONS FILES ----- -'.mailmap':: + +.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 |