Google Git
Sign in
googlers / jrn / git / 170774a39d32755fc013601d9d682ee034974625
commit170774a39d32755fc013601d9d682ee034974625[log] [tgz]
authorJon Seymour <jon.seymour@gmail.com>Thu Jun 23 12:01:12 2005 +1000
committerLinus Torvalds <torvalds@ppc970.osdl.org>Wed Jun 22 19:15:04 2005 -0700
tree592bcd41828f8893fe5503590a1b794ce42c6145
parent6e4c0a51092e3ec3429ca91890b99e198aa367bd [diff]
[PATCH] Fix to how --merge-order handles multiple roots

This patch addresses the problem reported by Paul Mackerras such that --merge-order
did not report the last root of a graph with merge of two independent roots.

Signed-off-by: Jon Seymour <jon.seymour@gmail.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
1 file changed
tree: 592bcd41828f8893fe5503590a1b794ce42c6145
  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-clone-script
  48. git-commit-script
  49. git-cvsimport-script
  50. git-deltafy-script
  51. git-diff-script
  52. git-external-diff-script
  53. git-fetch-script
  54. git-log-script
  55. git-merge-one-file-script
  56. git-prune-script
  57. git-pull-script
  58. git-reset-script
  59. git-resolve-script
  60. git-shortlog
  61. git-status-script
  62. git-tag-script
  63. git-whatchanged
  64. gitenv.c
  65. gitk
  66. http-pull.c
  67. index.c
  68. init-db.c
  69. INSTALL
  70. local-pull.c
  71. ls-files.c
  72. ls-tree.c
  73. Makefile
  74. merge-base.c
  75. merge-cache.c
  76. mkdelta.c
  77. mktag.c
  78. object.c
  79. object.h
  80. patch-delta.c
  81. pull.c
  82. pull.h
  83. read-cache.c
  84. read-tree.c
  85. README
  86. refs.c
  87. refs.h
  88. rev-list.c
  89. rev-parse.c
  90. rev-tree.c
  91. rsh.c
  92. rsh.h
  93. sha1_file.c
  94. ssh-pull.c
  95. ssh-push.c
  96. strbuf.c
  97. strbuf.h
  98. stripspace.c
  99. tag.c
  100. tag.h
  101. tar-tree.c
  102. test-date.c
  103. test-delta.c
  104. tree.c
  105. tree.h
  106. unpack-file.c
  107. update-cache.c
  108. usage.c
  109. write-blob.c
  110. write-tree.c