From: Junio C Hamano <junkio@cox.net>
Date: Fri, 18 Nov 2005 23:54:23 +0000 (-0800)
Subject: Merge branches 'jc/branch' and 'jc/rebase'
X-Git-Tag: v0.99.9k~1^2
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=0b4276931f4130e93f393cb8b9fa0ce2138f1d9c;p=git.git

Merge branches 'jc/branch' and 'jc/rebase'
---

0b4276931f4130e93f393cb8b9fa0ce2138f1d9c