Google Git
Sign in
googlers / jrn / git / 357ba5cf0d4c77c6b4ad8d2cc604392687a3e2a6
commit357ba5cf0d4c77c6b4ad8d2cc604392687a3e2a6[log] [tgz]
authorJunio C Hamano <gitster@pobox.com>Tue Dec 13 22:57:19 2011 -0800
committerJunio C Hamano <gitster@pobox.com>Tue Dec 13 22:57:19 2011 -0800
tree494aaff8a38b7d71c9b23b8c4176b27de433e3fb
parentb661a4bc1e172a9c67bf62bdc2715bd4efbc16e5 [diff]
parent37e7793d473019eac69c347f1a79e3273567b9bf [diff]
Merge branch 'tr/userdiff-c-returns-pointer'

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