?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: f29eaed 6b7242a)
Merge with master.
commit1ff53bfdeea4d707571c9cae818888c070b51153
authorJunio C Hamano <junkio@cox.net>
Sun, 7 Aug 2005 21:12:38 +0000 (7 14:12 -0700)
committerJunio C Hamano <junkio@cox.net>
Sun, 7 Aug 2005 21:12:38 +0000 (7 14:12 -0700)
tree3e38d18030effd892e76ab001b62be29866fd488tree | snapshot (tar.gz zip)
parentf29eaed12fc07bc5b2e4d1a302136a26ff4488cecommit | diff
parent6b7242aa1acc3c7835f80522914ffc4b2e789a29commit | diff
Merge with master.

This merges commit
    6b7242aa1acc3c7835f80522914ffc4b2e789a29
from master into our head commit
    f29eaed12fc07bc5b2e4d1a302136a26ff4488ce

Sincerely,
    jit-merge command.
Jonathan Nieder’s miscellaneous git branches