summaryrefslogtreecommitdiff
path: root/setup.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-11-30 19:05:48 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-11-30 19:05:48 (GMT)
commit5401f3040b61e11da79d676e42aacfa9f1131083 (patch)
tree524cbcce22c8cb228750c8d099a0ec81fbb1e028 /setup.c
parent0738fc2192109f946c033b3b003cb10aace9554e (diff)
parent830273d10cf1cfe646db39b87d3ccb49bf88b73a (diff)
parent246cc52f388cae8ca99e5a12b8458c9bfa467765 (diff)
parente9a45d75b5eccfc288c4533b5e34af1f77dd32c9 (diff)
parent0501c2409d7661d2b13f094136d246b9b5b8acf9 (diff)
downloadgit-5401f3040b61e11da79d676e42aacfa9f1131083.zip
git-5401f3040b61e11da79d676e42aacfa9f1131083.tar.gz
git-5401f3040b61e11da79d676e42aacfa9f1131083.tar.bz2
Merge branches 'jc/apply', 'lt/ls-tree', 'lt/bisect' and 'lt/merge'