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 /t/t6025-merge-symlinks.sh | |
| 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 't/t6025-merge-symlinks.sh')
0 files changed, 0 insertions, 0 deletions