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