Google Git
Sign in
code / git / 2092a1fefdacf9839332202fa62165e2ac91c899
commit2092a1fefdacf9839332202fa62165e2ac91c899[log] [tgz]
authorJunio C Hamano <junkio@cox.net>Sun Feb 11 22:05:36 2007 -0800
committerJunio C Hamano <junkio@cox.net>Sun Feb 11 22:05:36 2007 -0800
tree59a28d8ea65428fd6410b19eb9b5c63b64331d43
parentc5c3fc9851e6c89f8616729552d9b8a8dfea5555 [diff]
Teach git-am to pass -p option down to git-apply

This is originally from Andy Parkins whose patch used --patchdepth; let's
use -p which is more in line with the underlying git-apply.

Signed-off-by: Junio C Hamano <junkio@cox.net>
2 files changed
tree: 59a28d8ea65428fd6410b19eb9b5c63b64331d43
  1. arm/
  2. compat/
  3. contrib/
  4. Documentation/
  5. gitweb/
  6. mozilla-sha1/
  7. perl/
  8. ppc/
  9. t/
  10. templates/
  11. xdiff/
  12. .gitignore
  13. .mailmap
  14. alloc.c
  15. archive-tar.c
  16. archive-zip.c
  17. archive.h
  18. base85.c
  19. blob.c
  20. blob.h
  21. builtin-add.c
  22. builtin-annotate.c
  23. builtin-apply.c
  24. builtin-archive.c
  25. builtin-blame.c
  26. builtin-branch.c
  27. builtin-cat-file.c
  28. builtin-check-ref-format.c
  29. builtin-checkout-index.c
  30. builtin-commit-tree.c
  31. builtin-config.c
  32. builtin-count-objects.c
  33. builtin-describe.c
  34. builtin-diff-files.c
  35. builtin-diff-index.c
  36. builtin-diff-stages.c
  37. builtin-diff-tree.c
  38. builtin-diff.c
  39. builtin-fmt-merge-msg.c
  40. builtin-for-each-ref.c
  41. builtin-fsck.c
  42. builtin-grep.c
  43. builtin-init-db.c
  44. builtin-log.c
  45. builtin-ls-files.c
  46. builtin-ls-tree.c
  47. builtin-mailinfo.c
  48. builtin-mailsplit.c
  49. builtin-merge-file.c
  50. builtin-mv.c
  51. builtin-name-rev.c
  52. builtin-pack-objects.c
  53. builtin-pack-refs.c
  54. builtin-prune-packed.c
  55. builtin-prune.c
  56. builtin-push.c
  57. builtin-read-tree.c
  58. builtin-reflog.c
  59. builtin-rerere.c
  60. builtin-rev-list.c
  61. builtin-rev-parse.c
  62. builtin-rm.c
  63. builtin-runstatus.c
  64. builtin-shortlog.c
  65. builtin-show-branch.c
  66. builtin-show-ref.c
  67. builtin-stripspace.c
  68. builtin-symbolic-ref.c
  69. builtin-tar-tree.c
  70. builtin-unpack-objects.c
  71. builtin-update-index.c
  72. builtin-update-ref.c
  73. builtin-upload-archive.c
  74. builtin-verify-pack.c
  75. builtin-write-tree.c
  76. builtin.h
  77. cache-tree.c
  78. cache-tree.h
  79. cache.h
  80. check-builtins.sh
  81. check-racy.c
  82. color.c
  83. color.h
  84. combine-diff.c
  85. commit.c
  86. commit.h
  87. config.c
  88. config.mak.in
  89. configure.ac
  90. connect.c
  91. convert-objects.c
  92. copy.c
  93. COPYING
  94. csum-file.c
  95. csum-file.h
  96. ctype.c
  97. daemon.c
  98. date.c
  99. delta.h
  100. diff-delta.c
  101. diff-lib.c
  102. diff.c
  103. diff.h
  104. diffcore-break.c
  105. diffcore-delta.c
  106. diffcore-order.c
  107. diffcore-pickaxe.c
  108. diffcore-rename.c
  109. diffcore.h
  110. dir.c
  111. dir.h
  112. dump-cache-tree.c
  113. entry.c
  114. environment.c
  115. exec_cmd.c
  116. exec_cmd.h
  117. fast-import.c
  118. fetch-pack.c
  119. fetch.c
  120. fetch.h
  121. generate-cmdlist.sh
  122. git-add--interactive.perl
  123. git-am.sh
  124. git-applymbox.sh
  125. git-applypatch.sh
  126. git-archimport.perl
  127. git-bisect.sh
  128. git-checkout.sh
  129. git-clean.sh
  130. git-clone.sh
  131. git-commit.sh
  132. git-compat-util.h
  133. git-cvsexportcommit.perl
  134. git-cvsimport.perl
  135. git-cvsserver.perl
  136. git-fetch.sh
  137. git-gc.sh
  138. git-instaweb.sh
  139. git-lost-found.sh
  140. git-ls-remote.sh
  141. git-merge-octopus.sh
  142. git-merge-one-file.sh
  143. git-merge-ours.sh
  144. git-merge-resolve.sh
  145. git-merge-stupid.sh
  146. git-merge.sh
  147. git-p4import.py
  148. git-parse-remote.sh
  149. git-pull.sh
  150. git-quiltimport.sh
  151. git-rebase.sh
  152. git-relink.perl
  153. git-remote.perl
  154. git-repack.sh
  155. git-request-pull.sh
  156. git-reset.sh
  157. git-resolve.sh
  158. git-revert.sh
  159. git-send-email.perl
  160. git-sh-setup.sh
  161. git-svn.perl
  162. git-svnimport.perl
  163. git-tag.sh
  164. git-verify-tag.sh
  165. GIT-VERSION-GEN
  166. git.c
  167. git.spec.in
  168. gitk
  169. grep.c
  170. grep.h
  171. hash-object.c
  172. help.c
  173. http-fetch.c
  174. http-push.c
  175. http.c
  176. http.h
  177. ident.c
  178. imap-send.c
  179. index-pack.c
  180. INSTALL
  181. interpolate.c
  182. interpolate.h
  183. list-objects.c
  184. list-objects.h
  185. local-fetch.c
  186. lockfile.c
  187. log-tree.c
  188. log-tree.h
  189. Makefile
  190. merge-base.c
  191. merge-file.c
  192. merge-index.c
  193. merge-recursive.c
  194. merge-tree.c
  195. mktag.c
  196. mktree.c
  197. object-refs.c
  198. object.c
  199. object.h
  200. pack-check.c
  201. pack-redundant.c
  202. pack.h
  203. pager.c
  204. patch-delta.c
  205. patch-id.c
  206. path-list.c
  207. path-list.h
  208. path.c
  209. peek-remote.c
  210. pkt-line.c
  211. pkt-line.h
  212. quote.c
  213. quote.h
  214. reachable.c
  215. reachable.h
  216. read-cache.c
  217. README
  218. receive-pack.c
  219. reflog-walk.c
  220. reflog-walk.h
  221. refs.c
  222. refs.h
  223. revision.c
  224. revision.h
  225. rsh.c
  226. rsh.h
  227. run-command.c
  228. run-command.h
  229. send-pack.c
  230. server-info.c
  231. setup.c
  232. sha1_file.c
  233. sha1_name.c
  234. shallow.c
  235. shell.c
  236. show-index.c
  237. sideband.c
  238. sideband.h
  239. ssh-fetch.c
  240. ssh-pull.c
  241. ssh-push.c
  242. ssh-upload.c
  243. strbuf.c
  244. strbuf.h
  245. tag.c
  246. tag.h
  247. tar.h
  248. test-date.c
  249. test-delta.c
  250. test-sha1.c
  251. test-sha1.sh
  252. trace.c
  253. tree-diff.c
  254. tree-walk.c
  255. tree-walk.h
  256. tree.c
  257. tree.h
  258. unpack-file.c
  259. unpack-trees.c
  260. unpack-trees.h
  261. update-server-info.c
  262. upload-pack.c
  263. usage.c
  264. utf8.c
  265. utf8.h
  266. var.c
  267. write_or_die.c
  268. wt-status.c
  269. wt-status.h
  270. xdiff-interface.c
  271. xdiff-interface.h