Merge /pub/scm/git/git to recover lost side branch
commitbfadbeddd1b54af8ab08a6c556c43c756ec85588
authorJunio C Hamano <junio@hera.kernel.org>
Fri, 21 Oct 2005 00:06:15 +0000 (20 17:06 -0700)
committerJunio C Hamano <junio@hera.kernel.org>
Fri, 21 Oct 2005 00:06:15 +0000 (20 17:06 -0700)
tree50f9bed9a78e1f51178ebf6be3cd9c20b2ffcb0b
parentea5a65a59916503d2a14369c46b1023384d51645
parent6e1c6c103c522d01829f3a63992a023ff031e851
Merge /pub/scm/git/git to recover lost side branch

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>