GIT 1.5.6-rc0
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)

iD8DBQBIOfSrwMbZpPMRm5oRAmcyAJ0b0oW4GGskev/l6ON//44/UDEl/ACdEFPb
zOaGlccF3I2Nazv9EveeFg4=
=ZC6R
-----END PGP SIGNATURE-----
Merge branch 'js/config-cb'

* js/config-cb:
  Provide git_config with a callback-data parameter

Conflicts:

	builtin-add.c
	builtin-cat-file.c
tree: 5a4c77cc648dc720e40c76e83a489ab40e70e187
  1. .gitattributes
  2. .gitignore
  3. .mailmap
  4. COPYING
  5. Documentation/
  6. GIT-VERSION-GEN
  7. INSTALL
  8. Makefile
  9. README
  10. alias.c
  11. alloc.c
  12. archive-tar.c
  13. archive-zip.c
  14. archive.c
  15. archive.h
  16. arm/
  17. attr.c
  18. attr.h
  19. base85.c
  20. blob.c
  21. blob.h
  22. branch.c
  23. branch.h
  24. builtin-add.c
  25. builtin-annotate.c
  26. builtin-apply.c
  27. builtin-archive.c
  28. builtin-blame.c
  29. builtin-branch.c
  30. builtin-bundle.c
  31. builtin-cat-file.c
  32. builtin-check-attr.c
  33. builtin-check-ref-format.c
  34. builtin-checkout-index.c
  35. builtin-checkout.c
  36. builtin-clean.c
  37. builtin-clone.c
  38. builtin-commit-tree.c
  39. builtin-commit.c
  40. builtin-config.c
  41. builtin-count-objects.c
  42. builtin-describe.c
  43. builtin-diff-files.c
  44. builtin-diff-index.c
  45. builtin-diff-tree.c
  46. builtin-diff.c
  47. builtin-fast-export.c
  48. builtin-fetch--tool.c
  49. builtin-fetch-pack.c
  50. builtin-fetch.c
  51. builtin-fmt-merge-msg.c
  52. builtin-for-each-ref.c
  53. builtin-fsck.c
  54. builtin-gc.c
  55. builtin-grep.c
  56. builtin-http-fetch.c
  57. builtin-init-db.c
  58. builtin-log.c
  59. builtin-ls-files.c
  60. builtin-ls-remote.c
  61. builtin-ls-tree.c
  62. builtin-mailinfo.c
  63. builtin-mailsplit.c
  64. builtin-merge-base.c
  65. builtin-merge-file.c
  66. builtin-merge-ours.c
  67. builtin-merge-recursive.c
  68. builtin-mv.c
  69. builtin-name-rev.c
  70. builtin-pack-objects.c
  71. builtin-pack-refs.c
  72. builtin-prune-packed.c
  73. builtin-prune.c
  74. builtin-push.c
  75. builtin-read-tree.c
  76. builtin-reflog.c
  77. builtin-remote.c
  78. builtin-rerere.c
  79. builtin-reset.c
  80. builtin-rev-list.c
  81. builtin-rev-parse.c
  82. builtin-revert.c
  83. builtin-rm.c
  84. builtin-send-pack.c
  85. builtin-shortlog.c
  86. builtin-show-branch.c
  87. builtin-show-ref.c
  88. builtin-stripspace.c
  89. builtin-symbolic-ref.c
  90. builtin-tag.c
  91. builtin-tar-tree.c
  92. builtin-unpack-objects.c
  93. builtin-update-index.c
  94. builtin-update-ref.c
  95. builtin-upload-archive.c
  96. builtin-verify-pack.c
  97. builtin-verify-tag.c
  98. builtin-write-tree.c
  99. builtin.h
  100. bundle.c
  101. bundle.h
  102. cache-tree.c
  103. cache-tree.h
  104. cache.h
  105. check-builtins.sh
  106. check-racy.c
  107. color.c
  108. color.h
  109. combine-diff.c
  110. command-list.txt
  111. commit.c
  112. commit.h
  113. compat/
  114. config.c
  115. config.mak.in
  116. configure.ac
  117. connect.c
  118. contrib/
  119. convert.c
  120. copy.c
  121. csum-file.c
  122. csum-file.h
  123. ctype.c
  124. daemon.c
  125. date.c
  126. decorate.c
  127. decorate.h
  128. delta.h
  129. diff-delta.c
  130. diff-lib.c
  131. diff.c
  132. diff.h
  133. diffcore-break.c
  134. diffcore-delta.c
  135. diffcore-order.c
  136. diffcore-pickaxe.c
  137. diffcore-rename.c
  138. diffcore.h
  139. dir.c
  140. dir.h
  141. dump-cache-tree.c
  142. entry.c
  143. environment.c
  144. exec_cmd.c
  145. exec_cmd.h
  146. fast-import.c
  147. fetch-pack.h
  148. fixup-builtins
  149. fsck.c
  150. fsck.h
  151. generate-cmdlist.sh
  152. git-add--interactive.perl
  153. git-am.sh
  154. git-archimport.perl
  155. git-bisect.sh
  156. git-compat-util.h
  157. git-cvsexportcommit.perl
  158. git-cvsimport.perl
  159. git-cvsserver.perl
  160. git-filter-branch.sh
  161. git-gui/
  162. git-instaweb.sh
  163. git-lost-found.sh
  164. git-merge-octopus.sh
  165. git-merge-one-file.sh
  166. git-merge-resolve.sh
  167. git-merge-stupid.sh
  168. git-merge.sh
  169. git-mergetool.sh
  170. git-parse-remote.sh
  171. git-pull.sh
  172. git-quiltimport.sh
  173. git-rebase--interactive.sh
  174. git-rebase.sh
  175. git-relink.perl
  176. git-repack.sh
  177. git-request-pull.sh
  178. git-send-email.perl
  179. git-sh-setup.sh
  180. git-stash.sh
  181. git-submodule.sh
  182. git-svn.perl
  183. git-web--browse.sh
  184. git.c
  185. git.spec.in
  186. gitk-git/
  187. gitweb/
  188. graph.c
  189. graph.h
  190. grep.c
  191. grep.h
  192. hash-object.c
  193. hash.c
  194. hash.h
  195. help.c
  196. http-push.c
  197. http-walker.c
  198. http.c
  199. http.h
  200. ident.c
  201. imap-send.c
  202. index-pack.c
  203. interpolate.c
  204. interpolate.h
  205. list-objects.c
  206. list-objects.h
  207. ll-merge.c
  208. ll-merge.h
  209. lockfile.c
  210. log-tree.c
  211. log-tree.h
  212. mailmap.c
  213. mailmap.h
  214. match-trees.c
  215. merge-file.c
  216. merge-index.c
  217. merge-recursive.h
  218. merge-tree.c
  219. mktag.c
  220. mktree.c
  221. mozilla-sha1/
  222. name-hash.c
  223. object.c
  224. object.h
  225. pack-check.c
  226. pack-redundant.c
  227. pack-revindex.c
  228. pack-revindex.h
  229. pack-write.c
  230. pack.h
  231. pager.c
  232. parse-options.c
  233. parse-options.h
  234. patch-delta.c
  235. patch-id.c
  236. patch-ids.c
  237. patch-ids.h
  238. path-list.c
  239. path-list.h
  240. path.c
  241. perl/
  242. pkt-line.c
  243. pkt-line.h
  244. ppc/
  245. pretty.c
  246. progress.c
  247. progress.h
  248. quote.c
  249. quote.h
  250. reachable.c
  251. reachable.h
  252. read-cache.c
  253. receive-pack.c
  254. reflog-walk.c
  255. reflog-walk.h
  256. refs.c
  257. refs.h
  258. remote.c
  259. remote.h
  260. revision.c
  261. revision.h
  262. run-command.c
  263. run-command.h
  264. send-pack.h
  265. server-info.c
  266. setup.c
  267. sha1-lookup.c
  268. sha1-lookup.h
  269. sha1_file.c
  270. sha1_name.c
  271. shallow.c
  272. shell.c
  273. shortlog.h
  274. show-index.c
  275. sideband.c
  276. sideband.h
  277. strbuf.c
  278. strbuf.h
  279. symlinks.c
  280. t/
  281. tag.c
  282. tag.h
  283. tar.h
  284. templates/
  285. test-absolute-path.c
  286. test-chmtime.c
  287. test-date.c
  288. test-delta.c
  289. test-genrandom.c
  290. test-match-trees.c
  291. test-parse-options.c
  292. test-sha1.c
  293. test-sha1.sh
  294. thread-utils.c
  295. thread-utils.h
  296. trace.c
  297. transport.c
  298. transport.h
  299. tree-diff.c
  300. tree-walk.c
  301. tree-walk.h
  302. tree.c
  303. tree.h
  304. unpack-file.c
  305. unpack-trees.c
  306. unpack-trees.h
  307. update-server-info.c
  308. upload-pack.c
  309. usage.c
  310. utf8.c
  311. utf8.h
  312. var.c
  313. walker.c
  314. walker.h
  315. write_or_die.c
  316. ws.c
  317. wt-status.c
  318. wt-status.h
  319. xdiff-interface.c
  320. xdiff-interface.h
  321. xdiff/