Google Git
Sign in
code / git / e77f489edf3865dbcfd329461355523bb3c21075
commite77f489edf3865dbcfd329461355523bb3c21075[log] [tgz]
authorYann Dirson <ydirson@altern.org>Sun Jan 08 01:39:48 2006 +0100
committerJunio C Hamano <junkio@cox.net>Sun Jan 08 12:33:13 2006 -0800
tree5bf9ddfab3c0c09f76885659adafe192ad004283
parentb91db2707a4a3c48982c5fa052cf7ee3da8616cf [diff]
Add a test for rebase when a change was picked upstream

This test exercises the standard feature that makes rebase useful.

Signed-off-by: Yann Dirson <ydirson@altern.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
1 file changed
tree: 5bf9ddfab3c0c09f76885659adafe192ad004283
  1. arm/
  2. compat/
  3. debian/
  4. Documentation/
  5. mozilla-sha1/
  6. ppc/
  7. t/
  8. templates/
  9. .gitignore
  10. apply.c
  11. blob.c
  12. blob.h
  13. cache.h
  14. cat-file.c
  15. check-ref-format.c
  16. checkout-index.c
  17. clone-pack.c
  18. commit-tree.c
  19. commit.c
  20. commit.h
  21. config.c
  22. connect.c
  23. convert-objects.c
  24. copy.c
  25. COPYING
  26. count-delta.c
  27. count-delta.h
  28. csum-file.c
  29. csum-file.h
  30. ctype.c
  31. daemon.c
  32. date.c
  33. delta.h
  34. describe.c
  35. diff-delta.c
  36. diff-files.c
  37. diff-index.c
  38. diff-stages.c
  39. diff-tree.c
  40. diff.c
  41. diff.h
  42. diffcore-break.c
  43. diffcore-order.c
  44. diffcore-pathspec.c
  45. diffcore-pickaxe.c
  46. diffcore-rename.c
  47. diffcore.h
  48. entry.c
  49. environment.c
  50. epoch.c
  51. epoch.h
  52. fetch-clone.c
  53. fetch-pack.c
  54. fetch.c
  55. fetch.h
  56. fsck-objects.c
  57. get-tar-commit-id.c
  58. git-add.sh
  59. git-am.sh
  60. git-applymbox.sh
  61. git-applypatch.sh
  62. git-archimport.perl
  63. git-bisect.sh
  64. git-branch.sh
  65. git-checkout.sh
  66. git-cherry.sh
  67. git-clone.sh
  68. git-commit.sh
  69. git-compat-util.h
  70. git-count-objects.sh
  71. git-cvsexportcommit.perl
  72. git-cvsimport.perl
  73. git-diff.sh
  74. git-fetch.sh
  75. git-fmt-merge-msg.perl
  76. git-format-patch.sh
  77. git-grep.sh
  78. git-log.sh
  79. git-lost-found.sh
  80. git-ls-remote.sh
  81. git-merge-octopus.sh
  82. git-merge-one-file.sh
  83. git-merge-ours.sh
  84. git-merge-recursive.py
  85. git-merge-resolve.sh
  86. git-merge-stupid.sh
  87. git-merge.sh
  88. git-mv.perl
  89. git-parse-remote.sh
  90. git-prune.sh
  91. git-pull.sh
  92. git-push.sh
  93. git-rebase.sh
  94. git-relink.perl
  95. git-repack.sh
  96. git-request-pull.sh
  97. git-reset.sh
  98. git-resolve.sh
  99. git-revert.sh
  100. git-send-email.perl
  101. git-sh-setup.sh
  102. git-shortlog.perl
  103. git-status.sh
  104. git-svnimport.perl
  105. git-tag.sh
  106. git-verify-tag.sh
  107. GIT-VERSION-GEN
  108. git-whatchanged.sh
  109. git.c
  110. git.spec.in
  111. gitk
  112. gitMergeCommon.py
  113. hash-object.c
  114. http-fetch.c
  115. http-push.c
  116. http.c
  117. http.h
  118. ident.c
  119. index-pack.c
  120. index.c
  121. init-db.c
  122. INSTALL
  123. local-fetch.c
  124. ls-files.c
  125. ls-tree.c
  126. mailinfo.c
  127. mailsplit.c
  128. Makefile
  129. merge-base.c
  130. merge-index.c
  131. mktag.c
  132. name-rev.c
  133. object.c
  134. object.h
  135. pack-check.c
  136. pack-objects.c
  137. pack-redundant.c
  138. pack.h
  139. patch-delta.c
  140. patch-id.c
  141. path.c
  142. peek-remote.c
  143. pkt-line.c
  144. pkt-line.h
  145. prune-packed.c
  146. quote.c
  147. quote.h
  148. read-cache.c
  149. read-tree.c
  150. README
  151. receive-pack.c
  152. refs.c
  153. refs.h
  154. repo-config.c
  155. rev-list.c
  156. rev-parse.c
  157. rsh.c
  158. rsh.h
  159. run-command.c
  160. run-command.h
  161. send-pack.c
  162. server-info.c
  163. setup.c
  164. sha1_file.c
  165. sha1_name.c
  166. shell.c
  167. show-branch.c
  168. show-index.c
  169. ssh-fetch.c
  170. ssh-pull.c
  171. ssh-push.c
  172. ssh-upload.c
  173. strbuf.c
  174. strbuf.h
  175. stripspace.c
  176. symbolic-ref.c
  177. tag.c
  178. tag.h
  179. tar-tree.c
  180. test-date.c
  181. test-delta.c
  182. tree-diff.c
  183. tree.c
  184. tree.h
  185. unpack-file.c
  186. unpack-objects.c
  187. update-index.c
  188. update-ref.c
  189. update-server-info.c
  190. upload-pack.c
  191. usage.c
  192. var.c
  193. verify-pack.c
  194. write-tree.c