diff options
author | Junio C Hamano <junkio@cox.net> | 2005-11-18 15:54:23 -0800 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2005-11-18 15:54:23 -0800 |
commit | 0b4276931f4130e93f393cb8b9fa0ce2138f1d9c (patch) | |
tree | e887f3157fe315a40714bc76877a71a39824176a /Makefile | |
parent | f9039f30d56e3815eaab870d8b19c7b94aded8aa (diff) | |
parent | eb777612f085fc42afd0ac6986ed8062f8b75cbd (diff) | |
parent | 7f59dbbb8f8d479c1d31453eac06ec765436a780 (diff) | |
download | git-0b4276931f4130e93f393cb8b9fa0ce2138f1d9c.tar.gz git-0b4276931f4130e93f393cb8b9fa0ce2138f1d9c.tar.xz |
Merge branches 'jc/branch' and 'jc/rebase'