summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-11-18 23:54:23 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-11-18 23:54:23 (GMT)
commit0b4276931f4130e93f393cb8b9fa0ce2138f1d9c (patch)
treee887f3157fe315a40714bc76877a71a39824176a /debian
parentf9039f30d56e3815eaab870d8b19c7b94aded8aa (diff)
parenteb777612f085fc42afd0ac6986ed8062f8b75cbd (diff)
parent7f59dbbb8f8d479c1d31453eac06ec765436a780 (diff)
downloadgit-0b4276931f4130e93f393cb8b9fa0ce2138f1d9c.zip
git-0b4276931f4130e93f393cb8b9fa0ce2138f1d9c.tar.gz
git-0b4276931f4130e93f393cb8b9fa0ce2138f1d9c.tar.bz2
Merge branches 'jc/branch' and 'jc/rebase'