Google Git
Sign in
code / git / c505a850157961d2db4512d029753946d0591649
commitc505a850157961d2db4512d029753946d0591649[log] [tgz]
authorJunio C Hamano <gitster@pobox.com>Wed Mar 10 15:32:34 2010 -0800
committerJunio C Hamano <gitster@pobox.com>Wed Mar 10 15:32:34 2010 -0800
tree718529011f6b516554933451fad147341c3c3ca6
parente25ccff14071ec3628153992acc82b9922e16938 [diff]
parent6d8d8e0de3ca753cd482012d3695602e36356145 [diff]
Merge branch 'sh/am-keep-cr'

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