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

configure remote/local as mine/theirs

From
RTrupert THURNER <rupert.thurner@gmail.com>
Date
Apr 11, 2020, 12:51 UTC
Message-ID
<CAJs9aZ-iXUtZoumnMzTFPrc=mtz2+s4EDUKhxw_KQp42h3mxBw@mail.gmail.com>
hi,

the git documentation is so clear withcalling changes "mine" or "theirs". when configuring a mergetool e.g. kdiff3, and doing a rebase, these names are not used. instead it is "local", which is theirs in the rebase case, and remote, which is mine. not that this is rocket science, and i understand the technical reason why the names are like this. but anyway i get a nod in my brain about it sometimes. can i somehow configure git so it would use "mine" and "theirs" only?

rupert
Next: Johannes Sixt
Message 1 of 4 in “configure remote/local as mine/theirs”
  1. rupert THURNERApr 11, 2020
  2. Johannes SixtApr 11, 2020
  3. Philip OakleyApr 12, 2020
  4. rupert THURNERApr 13, 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.