Google Git
Sign in
googlers / jrn / git / e0226add28e53a35ce91cdbebb1919519f02b291
commite0226add28e53a35ce91cdbebb1919519f02b291[log] [tgz]
authorLinus Torvalds <torvalds@ppc970.osdl.org>Wed Jun 08 17:36:47 2005 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>Wed Jun 08 17:36:47 2005 -0700
tree162a7930fe8651b77fb544afba4a3a636aa8a55e
parent566487c8a617c12d68bf22c7078bce0b94fc8121 [diff]
Fix up git-merge-one-file-script

Junio points out that we may need to create the path leading
up the the file we merge.

And we need to be more careful with the "exec"s we've done
to exit on success - only do the on the last command in the
pipeline, not the first one ;)
1 file changed
tree: 162a7930fe8651b77fb544afba4a3a636aa8a55e
  1. Documentation/
  2. mozilla-sha1/
  3. ppc/
  4. t/
  5. apply.c
  6. blob.c
  7. blob.h
  8. cache.h
  9. cat-file.c
  10. check-files.c
  11. checkout-cache.c
  12. commit-tree.c
  13. commit.c
  14. commit.h
  15. convert-cache.c
  16. COPYING
  17. count-delta.c
  18. count-delta.h
  19. cvs2git.c
  20. date.c
  21. delta.c
  22. delta.h
  23. diff-cache.c
  24. diff-delta.c
  25. diff-files.c
  26. diff-helper.c
  27. diff-tree.c
  28. diff.c
  29. diff.h
  30. diffcore-break.c
  31. diffcore-order.c
  32. diffcore-pathspec.c
  33. diffcore-pickaxe.c
  34. diffcore-rename.c
  35. diffcore.h
  36. entry.c
  37. epoch.c
  38. epoch.h
  39. export.c
  40. fsck-cache.c
  41. get-tar-commit-id.c
  42. git
  43. git-apply-patch-script
  44. git-commit-script
  45. git-cvsimport-script
  46. git-deltafy-script
  47. git-external-diff-script
  48. git-fetch-script
  49. git-log-script
  50. git-merge-one-file-script
  51. git-prune-script
  52. git-pull-script
  53. git-resolve-script
  54. git-shortlog
  55. git-status-script
  56. git-tag-script
  57. git-whatchanged
  58. gitenv.c
  59. http-pull.c
  60. index.c
  61. init-db.c
  62. local-pull.c
  63. ls-files.c
  64. ls-tree.c
  65. Makefile
  66. merge-base.c
  67. merge-cache.c
  68. mkdelta.c
  69. mktag.c
  70. object.c
  71. object.h
  72. patch-delta.c
  73. pull.c
  74. pull.h
  75. read-cache.c
  76. read-tree.c
  77. README
  78. refs.c
  79. refs.h
  80. rev-list.c
  81. rev-tree.c
  82. rsh.c
  83. rsh.h
  84. sha1_file.c
  85. ssh-pull.c
  86. ssh-push.c
  87. strbuf.c
  88. strbuf.h
  89. stripspace.c
  90. tag.c
  91. tag.h
  92. tar-tree.c
  93. test-date.c
  94. test-delta.c
  95. tree.c
  96. tree.h
  97. unpack-file.c
  98. update-cache.c
  99. usage.c
  100. write-blob.c
  101. write-tree.c