Google Git
Sign in
googlers / jrn / git / 713b85c758926876af93fcabf4aae83391778195
commit713b85c758926876af93fcabf4aae83391778195[log] [tgz]
authorJunio C Hamano <gitster@pobox.com>Fri Oct 21 10:49:25 2011 -0700
committerJunio C Hamano <gitster@pobox.com>Fri Oct 21 10:49:25 2011 -0700
treebab82ae02e533f5d6abc201a447d8a5908c3e851
parent689b047072030db30d101d43dbef6afd3b703c09 [diff]
parent81b568c839376a10cd5fe29db0b8a72f537fa36a [diff]
Merge branch 'rs/diff-cleanup-records-fix' into maint

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