Google Git
Sign in
googlers / jrn / git / 7857e3246fef2fdfa3c0fc645cd3d72ff3e6572b
commit7857e3246fef2fdfa3c0fc645cd3d72ff3e6572b[log] [tgz]
authorJunio C Hamano <gitster@pobox.com>Tue Dec 13 21:44:56 2011 -0800
committerJunio C Hamano <gitster@pobox.com>Tue Dec 13 21:44:56 2011 -0800
tree6cd9d67bad0f51acbe6baef3fea257f8b0cbc01a
parent791970425431878c8abe71645a03f0f64e20e461 [diff]
parent15b7898c5e9fc6fed9a6064213cfcd08cf7d7314 [diff]
Merge branch 'maint-1.7.6' into maint-1.7.7

* maint-1.7.6:
  Git 1.7.6.5
  blame: don't overflow time buffer
  fetch: create status table using strbuf

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