mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
* configure remote/local as mine/theirs
@ 2020-04-11 12:51 rupert THURNER
  2020-04-11 21:40 ` Johannes Sixt
  0 siblings, 1 reply; 4+ messages in thread
From: rupert THURNER @ 2020-04-11 12:51 UTC (permalink / raw)
  To: git


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?


^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2020-04-13 10:59 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-04-11 12:51 configure remote/local as mine/theirs rupert THURNER
2020-04-11 21:40 ` Johannes Sixt
2020-04-12 10:12   ` Philip Oakley
2020-04-13 10:53     ` rupert THURNER

Code repositories for project(s) associated with this public inbox

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).