| commit | 0ef9198529d65c8b0733bf5775a0f8f47021f2f2 | |
| author | Jakub Narebski <jnareb@gmail.com> | |
| Sun, 1 Apr 2007 23:51:07 +0000 (2 01:51 +0200) | ||
| committer | Jakub Narebski <jnareb@gmail.com> | |
| Sun, 1 Apr 2007 23:51:07 +0000 (2 01:51 +0200) | ||
| tree | 8b313372a4925662d494f34caf74a5748dfc5f05 | treesnapshot (tar.gz zip) |
| parent | 87e24a9e1c324e76fbe043992197d227fa3ca3be | commitdiff |
| parent | d8b6a1a10b93666246984a50d64a163e71163aeb | commitdiff |
Merge branch 'master' of git://git./git/git
* 'master' of git://git.kernel.org/pub/scm/git/git:
cvsserver: Don't lie about binary mode in asciidoc documentation
git-svn: fail on rebase if we are unable to find a ref to rebase against
Keep rename/rename conflicts of intermediate merges while doing recursive merge
* 'master' of git://git.kernel.org/pub/scm/git/git:
cvsserver: Don't lie about binary mode in asciidoc documentation
git-svn: fail on rebase if we are unable to find a ref to rebase against
Keep rename/rename conflicts of intermediate merges while doing recursive merge