Merge /pub/scm/git/git to recover lost side branch
authorJunio C Hamano <junio@hera.kernel.org>
Fri, 21 Oct 2005 00:06:15 +0000 (17:06 -0700)
committerJunio C Hamano <junio@hera.kernel.org>
Fri, 21 Oct 2005 00:06:15 +0000 (17:06 -0700)
Sorry for the mistake of rewinding something already pushed out.
This recovers the side branch lost by that mistake, specifically
ea5a65a59916503d2a14369c46b1023384d51645 commit.

Signed-off-by: Junio C Hamano <junio@hera.kernel.org>

Trivial merge