| commit | d6958a1a32814af69a7571daa45252018c61f969 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 23 Apr 2008 06:37:06 +0000 (22 23:37 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 23 Apr 2008 06:37:06 +0000 (22 23:37 -0700) | ||
| tree | 355fe5cdd4749e67d8979f80f7dcdc649b9aba41 | treesnapshot (tar.gz zip) |
| parent | 491b1b11213c373a3e91004b1ab775d7e52ac1f3 | commitdiff |
| parent | 4f7ec7970874d09be162bc7f16415a0ec2d36ae5 | commitdiff |
Merge branch 'maint-1.5.4' into maint
* maint-1.5.4:
svn-git: Use binmode for reading/writing binary rev maps
diff options documentation: refer to --diff-filter in --name-status
git-svn bug with blank commits and author file
archive.c: format_subst - fixed bogus argument to memchr
copy.c: copy_fd - correctly report write errors
gitattributes: Fix subdirectory attributes specified from root directory
* maint-1.5.4:
svn-git: Use binmode for reading/writing binary rev maps
diff options documentation: refer to --diff-filter in --name-status
git-svn bug with blank commits and author file
archive.c: format_subst - fixed bogus argument to memchr
copy.c: copy_fd - correctly report write errors
gitattributes: Fix subdirectory attributes specified from root directory
| Documentation/diff-options.txt | diff1 | diff2 | blobhistory |
| git-svn.perl | diff1 | diff2 | blobhistory |
| t/t0003-attributes.sh | diff1 | diff2 | blobhistory |