git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH 1/6] Revert "Revert "Merge branch 'ra/rebase-i-more-options'""

From
Junio C Hamano <gitster@pobox.com>
Date
Apr 7, 2020, 21:04 UTC
Message-ID
<xmqqv9mbroqw.fsf@gitster.c.googlers.com>
In-Reply-To
<CABPp-BEnmpET=6rEdDXJWnPjzV33a2x6rKB6FQ-o8y+8ssK4jw@mail.gmail.com>
Elijah Newren <newren@gmail.com> writes:
Show 12 quoted lines
> On Tue, Apr 7, 2020 at 7:11 AM Phillip Wood <phillip.wood123@gmail.com> wrote:
>>
>> From: Phillip Wood <phillip.wood@dunelm.org.uk>
>>
>> This reverts commit 4d924528d8bfe947abfc54ee9bd3892ab509c8cd.
>>
>> This is being reverted to enable some fixups for
>> ra/rebase-i-more-options to be built on this commit.
>
> This makes sense to me, but it will be only the second 'Revert
> "Revert..."' commit in all of git.git and I'm curious if Junio will be
> unhappy with it.
Nah, there isn't much to become unhappy about.

I however suspect that the alternative would certainly be much nicer and easier to understand, which is to rebuild the 7-patch series c58ae96fc4..d82dfa7f5b but bugs already fixed, instead of doing this patch to take us back to a known buggy state and then fix the result with 5 more patches. Is that what you meant?

Previous: Phillip WoodNext: Junio C Hamano
Message 7 of 130 in “fixup ra/rebase-i-more-options”
  1. 0/6 fixup ra/rebase-i-more-optionsPhillip Wood, Apr 7, 2020
  2. 2/6 t3433: remove loops from testsPhillip Wood, Apr 7, 2020
  3. Elijah NewrenApr 7, 2020
  4. 1/6 Revert "Revert "Merge branch 'ra/rebase-i-more-options'""Phillip Wood, Apr 7, 2020
  5. Elijah NewrenApr 7, 2020
  6. Phillip WoodApr 7, 2020
  7. Junio C HamanoApr 7, 2020
  8. Junio C HamanoApr 7, 2020
  9. Johannes SchindelinApr 12, 2020
  10. Phillip WoodApr 13, 2020
  11. Junio C HamanoApr 13, 2020
  12. 3/6 t3433: only compare commit datesPhillip Wood, Apr 7, 2020
  13. 4/6 rebase -i: fix --committer-date-is-author-datePhillip Wood, Apr 7, 2020
  14. Elijah NewrenApr 7, 2020
  15. Phillip WoodApr 7, 2020
  16. 5/6 Revert "sequencer: allow callers of read_author_script() to ignore fields"Phillip Wood, Apr 7, 2020
  17. Elijah NewrenApr 7, 2020
  18. 6/6 t3433: improve coveragePhillip Wood, Apr 7, 2020
  19. Elijah NewrenApr 7, 2020
  20. Phillip WoodApr 7, 2020
  21. Elijah NewrenApr 7, 2020
  22. Phillip WoodApr 7, 2020
  23. Junio C HamanoApr 7, 2020
  24. 0/5 cleanup ra/rebase-i-more-optionsPhillip Wood, Apr 29, 2020
  25. 1/5 rebase -i: add --ignore-whitespace flagPhillip Wood, Apr 29, 2020
  26. Elijah NewrenMay 13, 2020
  27. Phillip WoodMay 14, 2020
  28. 3/5 sequencer: rename amend_author to author_to_freePhillip Wood, Apr 29, 2020
  29. 2/5 rebase -i: support --committer-date-is-author-datePhillip Wood, Apr 29, 2020
  30. Alban GruinMay 10, 2020
  31. Elijah NewrenMay 13, 2020
  32. 5/5 rebase: add --reset-author-datePhillip Wood, Apr 29, 2020
  33. 4/5 rebase -i: support --ignore-datePhillip Wood, Apr 29, 2020
  34. Alban GruinMay 10, 2020
  35. Phillip WoodMay 12, 2020
  36. Junio C HamanoMay 13, 2020
  37. Elijah NewrenMay 13, 2020
  38. Junio C HamanoApr 29, 2020
  39. Elijah NewrenMay 13, 2020
  40. 0/5 cleanup ra/rebase-i-more-optionsPhillip Wood, May 21, 2020
  41. 1/5 rebase -i: add --ignore-whitespace flagPhillip Wood, May 21, 2020
  42. 2/5 rebase -i: support --committer-date-is-author-datePhillip Wood, May 21, 2020
  43. 5/5 rebase: add --reset-author-datePhillip Wood, May 21, 2020
  44. 4/5 rebase -i: support --ignore-datePhillip Wood, May 21, 2020
  45. Đoàn Trần Công DanhMay 23, 2020
  46. Phillip WoodMay 23, 2020
  47. Đoàn Trần Công DanhMay 23, 2020
  48. Phillip WoodMay 23, 2020
  49. Đoàn Trần Công DanhMay 23, 2020
  50. Phillip WoodMay 27, 2020
  51. Junio C HamanoMay 24, 2020
  52. 3/5 sequencer: rename amend_author to author_to_freePhillip Wood, May 21, 2020
  53. Elijah NewrenMay 22, 2020
  54. Phillip WoodMay 23, 2020
  55. Johannes SchindelinMay 23, 2020
  56. 0/5 cleanup ra/rebase-i-more-optionsPhillip Wood, May 27, 2020
  57. 1/5 rebase -i: add --ignore-whitespace flagPhillip Wood, May 27, 2020
  58. Johannes SchindelinMay 29, 2020
  59. Kerry, RichardJun 1, 2020
  60. Phillip WoodJun 1, 2020
  61. Johannes SchindelinJun 1, 2020
  62. 2/5 rebase -i: support --committer-date-is-author-datePhillip Wood, May 27, 2020
  63. Johannes SchindelinMay 29, 2020
  64. Phillip WoodJun 1, 2020
  65. 3/5 sequencer: rename amend_author to author_to_freePhillip Wood, May 27, 2020
  66. 4/5 rebase -i: support --ignore-datePhillip Wood, May 27, 2020
  67. 5/5 rebase: add --reset-author-datePhillip Wood, May 27, 2020
  68. 6/5 fixup! rebase: add --reset-author-datePhillip Wood, May 27, 2020
  69. Đoàn Trần Công DanhMay 28, 2020
  70. Johannes SchindelinMay 29, 2020
  71. Phillip WoodJun 1, 2020
  72. Junio C HamanoMay 27, 2020
  73. 0/5 cleanup ra/rebase-i-more-optionsPhillip Wood, Jun 26, 2020
  74. 1/5 rebase -i: add --ignore-whitespace flagPhillip Wood, Jun 26, 2020
  75. Đoàn Trần Công DanhJun 26, 2020
  76. Phillip WoodJun 26, 2020
  77. Junio C HamanoJun 26, 2020
  78. Đoàn Trần Công DanhJun 29, 2020
  79. Phillip WoodJul 13, 2020
  80. Junio C HamanoJun 26, 2020
  81. 2/5 rebase -i: support --committer-date-is-author-datePhillip Wood, Jun 26, 2020
  82. 3/5 sequencer: rename amend_author to author_to_freePhillip Wood, Jun 26, 2020
  83. 4/5 rebase -i: support --ignore-datePhillip Wood, Jun 26, 2020
  84. Đoàn Trần Công DanhJun 26, 2020
  85. Phillip WoodJun 26, 2020
  86. Junio C HamanoJun 26, 2020
  87. 5/5 rebase: add --reset-author-datePhillip Wood, Jun 26, 2020
  88. Junio C HamanoJun 26, 2020
  89. Phillip WoodJun 26, 2020
  90. Junio C HamanoJun 26, 2020
  91. 0/5 fixup ra/rebase-i-more-optionsPhillip Wood, Jul 13, 2020
  92. 2/5 rebase -i: support --committer-date-is-author-datePhillip Wood, Jul 13, 2020
  93. Đoàn Trần Công DanhJul 15, 2020
  94. Phillip WoodJul 16, 2020
  95. Đoàn Trần Công DanhJul 16, 2020
  96. Phillip WoodJul 16, 2020
  97. Phillip WoodJul 16, 2020
  98. Đoàn Trần Công DanhJul 17, 2020
  99. 1/5 rebase -i: add --ignore-whitespace flagPhillip Wood, Jul 13, 2020
  100. 3/5 sequencer: rename amend_author to author_to_freePhillip Wood, Jul 13, 2020
  101. 4/5 rebase -i: support --ignore-datePhillip Wood, Jul 13, 2020
  102. 5/5 rebase: add --reset-author-datePhillip Wood, Jul 13, 2020
  103. Junio C HamanoJul 13, 2020
  104. Phillip WoodJul 15, 2020
  105. 0/5 cleanup ra/rebase-i-more-optionsPhillip Wood, Jul 16, 2020
  106. 1/5 rebase -i: add --ignore-whitespace flagPhillip Wood, Jul 16, 2020
  107. 2/5 rebase -i: support --committer-date-is-author-datePhillip Wood, Jul 16, 2020
  108. Johannes SchindelinAug 13, 2020
  109. 3/5 sequencer: rename amend_author to author_to_freePhillip Wood, Jul 16, 2020
  110. 5/5 rebase: add --reset-author-datePhillip Wood, Jul 16, 2020
  111. 4/5 rebase -i: support --ignore-datePhillip Wood, Jul 16, 2020
  112. Johannes SchindelinAug 13, 2020
  113. Junio C HamanoJul 16, 2020
  114. Johannes SchindelinAug 13, 2020
  115. Junio C HamanoAug 13, 2020
  116. Phillip WoodAug 13, 2020
  117. 0/5 cleanup ra/rebase-i-more-optionsPhillip Wood, Aug 17, 2020
  118. 2/5 am: stop exporting GIT_COMMITTER_DATEPhillip Wood, Aug 17, 2020
  119. Junio C HamanoAug 17, 2020
  120. Phillip WoodAug 19, 2020
  121. Junio C HamanoAug 19, 2020
  122. Phillip WoodAug 20, 2020
  123. 4/5 rebase -i: support --ignore-datePhillip Wood, Aug 17, 2020
  124. Phillip WoodAug 19, 2020
  125. Junio C HamanoAug 19, 2020
  126. Phillip WoodAug 20, 2020
  127. 5/5 rebase: add --reset-author-datePhillip Wood, Aug 17, 2020
  128. 3/5 rebase -i: support --committer-date-is-author-datePhillip Wood, Aug 17, 2020
  129. Junio C HamanoAug 26, 2020
  130. 1/5 rebase -i: add --ignore-whitespace flagPhillip Wood, Aug 17, 2020

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.