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

Re: Feature Request: user defined suffix for temp files created by git-mergetool

From
Junio C Hamano <gitster@pobox.com>
Date
Oct 6, 2016, 16:58 UTC
Message-ID
<xmqqbmyxmn1q.fsf@gitster.mtv.corp.google.com>
In-Reply-To
<1214659824.1976049.1475738509473.JavaMail.zimbra@redhat.com>
Josef Ridky <jridky@redhat.com> writes:
> I agree, that this patch is written as general as possible and can
> possibly bring more confusion than benefits.

I am not sure about that. Other people would have similar but different workflow needs where they compare local new one with local old one that would be helped by renaming local to old and remote to new (i.e. the other way around from your need). If you just add a toggle between local-remote vs new-old, that would be just an additional code baggage that does not help people other than you.

I think J6t's "EDIT THIS" hits the center of the issue. If users are trained to know LOCAL is the one to be edited, would the current UI work well enough for them thru your custom workflow tools? If we rename LOCAL to "EDIT THIS" and do nothing else, would such UI work well for even untrained users thru your custom workflow tools?

Previous: David AguilarNext: Junio C Hamano
Message 18 of 19 in “Feature Request: user defined suffix for temp files created by git-mergetool”
  1. Josef RidkyOct 3, 2016
  2. Anatoly BorodinOct 3, 2016
  3. Josef RidkyOct 4, 2016
  4. David AguilarOct 5, 2016
  5. Josef RidkyOct 5, 2016
  6. Josef RidkyOct 5, 2016
  7. Junio C HamanoOct 5, 2016
  8. Josef RidkyOct 6, 2016
  9. Johannes SixtOct 5, 2016
  10. Josef RidkyOct 6, 2016
  11. 1/2 Feature Request: user defined suffix for temp files created by git-mergetoolJosef Ridky, Oct 6, 2016
  12. 2/2 Feature Request: user defined suffix for temp files created by git-mergetoolJosef Ridky, Oct 6, 2016
  13. Junio C HamanoOct 6, 2016
  14. Josef RidkyOct 12, 2016
  15. Junio C HamanoOct 12, 2016
  16. David AguilarOct 13, 2016
  17. David AguilarOct 13, 2016
  18. Junio C HamanoOct 6, 2016
  19. Junio C HamanoOct 6, 2016

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.