Google Git
Sign in
googlers / jrn / git / d28790dc31ca1bcdca7254a6b9381b6c84e91271
commitd28790dc31ca1bcdca7254a6b9381b6c84e91271[log] [tgz]
authorJeff King <peff@peff.net>Wed Jul 06 11:13:30 2011 -0400
committerJunio C Hamano <gitster@pobox.com>Wed Jul 06 11:10:11 2011 -0700
tree290988244cf5eb56978a632433bb6eb61b42352b
parent76c82f90abde8820461e042c6654673f1147881d [diff]
docs: document --textconv diff option

This has been there since textconv existed, but was never
documented. There is some overlap with what's in
gitattributes(5), but it's important to warn in both places
that textconv diffs probably can't be applied.

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