Google Git
Sign in
googlers / jrn / git / 59e6b23acef9d29b9bdabc38ee80361e19ef7ebe
commit59e6b23acef9d29b9bdabc38ee80361e19ef7ebe[log] [tgz]
authorJunio C Hamano <junkio@cox.net>Sat Jun 25 02:23:43 2005 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>Sat Jun 25 16:52:16 2005 -0700
tree32e674e352960114da7940e79f7ba1d23d3c818e
parent93c36dcd0a4f6373e3a02a8505046801106ddb85 [diff]
[PATCH] git-rebase-script: rebase local commits to new upstream head.

Using git-cherry, forward port local commits missing from the
new upstream head.  This also depends on "-m" flag support in
git-commit-script.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2 files changed
tree: 32e674e352960114da7940e79f7ba1d23d3c818e
  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-stages.c
  28. diff-tree.c
  29. diff.c
  30. diff.h
  31. diffcore-break.c
  32. diffcore-order.c
  33. diffcore-pathspec.c
  34. diffcore-pickaxe.c
  35. diffcore-rename.c
  36. diffcore.h
  37. entry.c
  38. epoch.c
  39. epoch.h
  40. export.c
  41. fsck-cache.c
  42. get-tar-commit-id.c
  43. git
  44. git-add-script
  45. git-apply-patch-script
  46. git-checkout-script
  47. git-cherry
  48. git-clone-script
  49. git-commit-script
  50. git-cvsimport-script
  51. git-deltafy-script
  52. git-diff-script
  53. git-external-diff-script
  54. git-fetch-script
  55. git-log-script
  56. git-merge-one-file-script
  57. git-prune-script
  58. git-pull-script
  59. git-rebase-script
  60. git-reset-script
  61. git-resolve-script
  62. git-shortlog
  63. git-status-script
  64. git-tag-script
  65. git-whatchanged
  66. gitenv.c
  67. gitk
  68. http-pull.c
  69. index.c
  70. init-db.c
  71. INSTALL
  72. local-pull.c
  73. ls-files.c
  74. ls-tree.c
  75. Makefile
  76. merge-base.c
  77. merge-cache.c
  78. mkdelta.c
  79. mktag.c
  80. object.c
  81. object.h
  82. pack-objects.c
  83. patch-delta.c
  84. patch-id.c
  85. pull.c
  86. pull.h
  87. read-cache.c
  88. read-tree.c
  89. README
  90. refs.c
  91. refs.h
  92. rev-list.c
  93. rev-parse.c
  94. rev-tree.c
  95. rsh.c
  96. rsh.h
  97. sha1_file.c
  98. ssh-pull.c
  99. ssh-push.c
  100. strbuf.c
  101. strbuf.h
  102. stripspace.c
  103. tag.c
  104. tag.h
  105. tar-tree.c
  106. test-date.c
  107. test-delta.c
  108. tree.c
  109. tree.h
  110. unpack-file.c
  111. unpack-objects.c
  112. update-cache.c
  113. usage.c
  114. write-blob.c
  115. write-tree.c