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/RelNotes-1.5.1.1.txt | |
| parent | abbf594763a14e9c00c61f688e45bed636f1eb52 (diff) | |
| parent | 0ad64fd0b8d073e0c73836858a54f693c9191918 (diff) | |
| download | git-6fb8e8f401a065bdffe379764871551e37a041a0.tar.gz git-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/RelNotes-1.5.1.1.txt')
| -rw-r--r-- | Documentation/RelNotes-1.5.1.1.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/RelNotes-1.5.1.1.txt b/Documentation/RelNotes-1.5.1.1.txt index 3054b5a3f..91471213b 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. |