Google Git
Sign in
code/git/91fc159745eccb0830c9719642d07617c8100b41
commit
91fc159745eccb0830c9719642d07617c8100b41
[log]
author
Junio C Hamano <gitster@pobox.com>
Thu Jun 27 14:30:07 2013 -0700
committer
Junio C Hamano <gitster@pobox.com>
Thu Jun 27 14:30:07 2013 -0700
tree
898838ba0c60359f43bcd32ca23cf35a2f44d0bb
parent
644daa9428323ecdef08dfce589aa386bd2d97d4 [diff]
parent
e5c29097826be86e2f18139491cdf9c830c7fa3e [diff]
Merge branch 'jk/add-i-custom-diff-algo'

* jk/add-i-custom-diff-algo:
  add -i: add extra options at the right place in "diff" command line
  add--interactive: respect diff.algorithm
tree: 898838ba0c60359f43bcd32ca23cf35a2f44d0bb
  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.8.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. bulk-checkin.c
  45. bulk-checkin.h
  46. bundle.c
  47. bundle.h
  48. cache-tree.c
  49. cache-tree.h
  50. cache.h
  51. check-builtins.sh
  52. check-racy.c
  53. check_bindir
  54. color.c
  55. color.h
  56. column.c
  57. column.h
  58. combine-diff.c
  59. command-list.txt
  60. commit.c
  61. commit.h
  62. config.c
  63. config.mak.in
  64. config.mak.uname
  65. configure.ac
  66. connect.c
  67. connected.c
  68. connected.h
  69. convert.c
  70. convert.h
  71. copy.c
  72. COPYING
  73. credential-cache--daemon.c
  74. credential-cache.c
  75. credential-store.c
  76. credential.c
  77. credential.h
  78. csum-file.c
  79. csum-file.h
  80. ctype.c
  81. daemon.c
  82. date.c
  83. decorate.c
  84. decorate.h
  85. delta.h
  86. diff-delta.c
  87. diff-lib.c
  88. diff-no-index.c
  89. diff.c
  90. diff.h
  91. diffcore-break.c
  92. diffcore-delta.c
  93. diffcore-order.c
  94. diffcore-pickaxe.c
  95. diffcore-rename.c
  96. diffcore.h
  97. dir.c
  98. dir.h
  99. editor.c
  100. entry.c
  101. environment.c
  102. exec_cmd.c
  103. exec_cmd.h
  104. fast-import.c
  105. fetch-pack.c
  106. fetch-pack.h
  107. fixup-builtins
  108. fmt-merge-msg.h
  109. fsck.c
  110. fsck.h
  111. generate-cmdlist.sh
  112. gettext.c
  113. gettext.h
  114. git-add--interactive.perl
  115. git-am.sh
  116. git-archimport.perl
  117. git-bisect.sh
  118. git-compat-util.h
  119. git-cvsexportcommit.perl
  120. git-cvsimport.perl
  121. git-cvsserver.perl
  122. git-difftool--helper.sh
  123. git-difftool.perl
  124. git-filter-branch.sh
  125. git-instaweb.sh
  126. git-lost-found.sh
  127. git-merge-octopus.sh
  128. git-merge-one-file.sh
  129. git-merge-resolve.sh
  130. git-mergetool--lib.sh
  131. git-mergetool.sh
  132. git-p4.py
  133. git-parse-remote.sh
  134. git-pull.sh
  135. git-quiltimport.sh
  136. git-rebase--am.sh
  137. git-rebase--interactive.sh
  138. git-rebase--merge.sh
  139. git-rebase.sh
  140. git-relink.perl
  141. git-remote-testgit.sh
  142. git-remote-testpy.py
  143. git-repack.sh
  144. git-request-pull.sh
  145. git-send-email.perl
  146. git-sh-i18n.sh
  147. git-sh-setup.sh
  148. git-stash.sh
  149. git-submodule.sh
  150. git-svn.perl
  151. GIT-VERSION-GEN
  152. git-web--browse.sh
  153. git.c
  154. git.rc
  155. git.spec.in
  156. gpg-interface.c
  157. gpg-interface.h
  158. graph.c
  159. graph.h
  160. grep.c
  161. grep.h
  162. hash.c
  163. hash.h
  164. help.c
  165. help.h
  166. hex.c
  167. http-backend.c
  168. http-fetch.c
  169. http-push.c
  170. http-walker.c
  171. http.c
  172. http.h
  173. ident.c
  174. imap-send.c
  175. INSTALL
  176. kwset.c
  177. kwset.h
  178. levenshtein.c
  179. levenshtein.h
  180. LGPL-2.1
  181. line-log.c
  182. line-log.h
  183. line-range.c
  184. line-range.h
  185. list-objects.c
  186. list-objects.h
  187. ll-merge.c
  188. ll-merge.h
  189. lockfile.c
  190. log-tree.c
  191. log-tree.h
  192. mailmap.c
  193. mailmap.h
  194. Makefile
  195. match-trees.c
  196. merge-blobs.c
  197. merge-blobs.h
  198. merge-recursive.c
  199. merge-recursive.h
  200. merge.c
  201. mergesort.c
  202. mergesort.h
  203. name-hash.c
  204. notes-cache.c
  205. notes-cache.h
  206. notes-merge.c
  207. notes-merge.h
  208. notes-utils.c
  209. notes-utils.h
  210. notes.c
  211. notes.h
  212. object.c
  213. object.h
  214. pack-check.c
  215. pack-revindex.c
  216. pack-revindex.h
  217. pack-write.c
  218. pack.h
  219. pager.c
  220. parse-options-cb.c
  221. parse-options.c
  222. parse-options.h
  223. patch-delta.c
  224. patch-ids.c
  225. patch-ids.h
  226. path.c
  227. pathspec.c
  228. pathspec.h
  229. pkt-line.c
  230. pkt-line.h
  231. preload-index.c
  232. pretty.c
  233. progress.c
  234. progress.h
  235. prompt.c
  236. prompt.h
  237. quote.c
  238. quote.h
  239. reachable.c
  240. reachable.h
  241. read-cache.c
  242. README
  243. reflog-walk.c
  244. reflog-walk.h
  245. refs.c
  246. refs.h
  247. remote-curl.c
  248. remote-testsvn.c
  249. remote.c
  250. remote.h
  251. replace_object.c
  252. rerere.c
  253. rerere.h
  254. resolve-undo.c
  255. resolve-undo.h
  256. revision.c
  257. revision.h
  258. run-command.c
  259. run-command.h
  260. send-pack.c
  261. send-pack.h
  262. sequencer.c
  263. sequencer.h
  264. server-info.c
  265. setup.c
  266. sh-i18n--envsubst.c
  267. sha1-array.c
  268. sha1-array.h
  269. sha1-lookup.c
  270. sha1-lookup.h
  271. sha1_file.c
  272. sha1_name.c
  273. shallow.c
  274. shell.c
  275. shortlog.h
  276. show-index.c
  277. sideband.c
  278. sideband.h
  279. sigchain.c
  280. sigchain.h
  281. strbuf.c
  282. strbuf.h
  283. streaming.c
  284. streaming.h
  285. string-list.c
  286. string-list.h
  287. submodule.c
  288. submodule.h
  289. symlinks.c
  290. tag.c
  291. tag.h
  292. tar.h
  293. test-chmtime.c
  294. test-ctype.c
  295. test-date.c
  296. test-delta.c
  297. test-dump-cache-tree.c
  298. test-genrandom.c
  299. test-index-version.c
  300. test-line-buffer.c
  301. test-match-trees.c
  302. test-mergesort.c
  303. test-mktemp.c
  304. test-parse-options.c
  305. test-path-utils.c
  306. test-read-cache.c
  307. test-regex.c
  308. test-revision-walking.c
  309. test-run-command.c
  310. test-scrap-cache-tree.c
  311. test-sha1.c
  312. test-sha1.sh
  313. test-sigchain.c
  314. test-string-list.c
  315. test-subprocess.c
  316. test-svn-fe.c
  317. test-wildmatch.c
  318. thread-utils.c
  319. thread-utils.h
  320. trace.c
  321. transport-helper.c
  322. transport.c
  323. transport.h
  324. tree-diff.c
  325. tree-walk.c
  326. tree-walk.h
  327. tree.c
  328. tree.h
  329. unimplemented.sh
  330. unix-socket.c
  331. unix-socket.h
  332. unpack-trees.c
  333. unpack-trees.h
  334. upload-pack.c
  335. url.c
  336. url.h
  337. usage.c
  338. userdiff.c
  339. userdiff.h
  340. utf8.c
  341. utf8.h
  342. varint.c
  343. varint.h
  344. version.c
  345. version.h
  346. walker.c
  347. walker.h
  348. wildmatch.c
  349. wildmatch.h
  350. wrap-for-bin.sh
  351. wrapper.c
  352. write_or_die.c
  353. ws.c
  354. wt-status.c
  355. wt-status.h
  356. xdiff-interface.c
  357. xdiff-interface.h
  358. zlib.c