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

Re: odd behavior with git-rebase

From
Junio C Hamano <gitster@pobox.com>
Date
Mar 28, 2012, 17:08 UTC
Message-ID
<7viphowt43.fsf@alter.siamese.dyndns.org>
In-Reply-To
<4F72AD25.2090102@gmail.com>
Neal Kreitzinger <nkreitzinger@gmail.com> writes:
Show 6 quoted lines
> On 3/26/2012 5:53 PM, Phil Hord wrote:
> ...
>>  2. There is a rerere autoresolved conflict git wants me to approve
>>  examine / test / --continue
>
> You trust rerere?  I take back my earlier comment,...

He does "rerere" and then "examine"s, doesn't he? So it is not "blindly trust", but "trust and verify".

Show 6 quoted lines
>>  I really wanted something like this:
>>
>>  $ git rebase --purge-empty --accept-rerere-authority -i master
>>
> --accept-rerere-authority sounds like another recent thread (maybe
> from you).

It was from a different person and on a different command, but I think they are going in the same direction. The "--rerere-autoupdate" option of "git am", "git rebase" and "git merge" could learn to be a bool-plus, a stronger form than "yes/no", such that it makes a commit if everything auto-resolves cleanly (and rerere.autoupdate configuration could learn to be a bool-plus as well).

While I am hesitant to endorse such a mode of operation, as it can invite sloppy users hurt themselves, I do not fundamentally oppose it as an option. It could save time for diligent users who know when to examine and verify the result, in order to avoid casting the result with blind faith in mechanical merges.

Previous: Phil Hord
Message 17 of 17 in “odd behavior with git-rebase”
  1. Neil HormanMar 23, 2012
  2. Jeff KingMar 23, 2012
  3. Phil HordMar 26, 2012
  4. Jeff KingMar 26, 2012
  5. Junio C HamanoMar 23, 2012
  6. Neil HormanMar 24, 2012
  7. Junio C HamanoMar 26, 2012
  8. Neil HormanMar 26, 2012
  9. Neal KreitzingerMar 26, 2012
  10. Phil HordMar 26, 2012
  11. Phil HordMar 26, 2012
  12. Neil HormanMar 26, 2012
  13. Jay SoffianMar 27, 2012
  14. Neal KreitzingerMar 26, 2012
  15. Neil HormanMar 26, 2012
  16. Phil HordMar 28, 2012
  17. Junio C HamanoMar 28, 2012

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.