Google Git
Sign in
googlers / jrn / git / 804c7174c9d7c81b5215bcd9002f3bd600ecb6e4
commit804c7174c9d7c81b5215bcd9002f3bd600ecb6e4[log] [tgz]
authorWincent Colaiuta <win@wincent.com>Wed Nov 28 00:06:36 2007 -0800
committerJunio C Hamano <gitster@pobox.com>Fri Nov 30 13:55:49 2007 -0800
tree138b93dbc0115d90ea5c20da4ff6a0b7c63c5bba
parentd25430c5f88c7e7b4ce24c1b08e409f4345c4eb9 [diff]
revert/cherry-pick: Allow overriding the help text by the calling Porcelain

A Porcelain command that uses cherry-pick or revert may make a commit
out of resolved index itself, in which case telling the user to commit
the result is not appropriate at all.  This allows GIT_CHERRY_PICK_HELP
environment variable to be set by the calling Porcelain in order to
override the built-in help text.

[jc: this is heavily modified from the original but should be equivalent
 in spirit]

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