From: Philip Oakley <email@example.com>
To: Johannes Sixt <firstname.lastname@example.org>, rupert THURNER <email@example.com>
Cc: Git Mailing List <firstname.lastname@example.org>
Subject: Re: configure remote/local as mine/theirs
Date: Sun, 12 Apr 2020 11:12:12 +0100 [thread overview]
Message-ID: <email@example.com> (raw)
Hi Robert, Johannes
On 11/04/2020 22:40, Johannes Sixt wrote:
> Am 11.04.20 um 14:51 schrieb rupert THURNER:
>> 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?
> The words "mine" (actually "ours") and "theirs" have a very precise
> meaning in Git. If you were to use these meanings during a rebase, you
> would not like the result: it would call "ours" what you intend to call
> "theirs", and vice versa.
> Consider this history:
> --a--b--c--d <-- upstream ("theirs" from your point of view)
> x--y--z <-- branch to rebase ("mine/ours" from your POV)
> During a rebase, Git is "positioned" on the history following commit d,
> i.e. on "their" branch. Then it cherry-picks commits x, y, and z. In
> that situation, the change that you consider "theirs" is actually "ours"
> from Git's point of view, and your own change (those introduced by x, y,
> and z) are "theirs" from Git's point of view.
> I suggest you live with "local" and "remote" for a bit less confusion.
given the way Git is using it's terminology, would you have any
suggestions as to how the man page(s) could now be _clarified_ so as to
avoid these potential misunderstandings? Even perhaps
"theirs", "ours", "local" and "remote" are distinct terms in Git
with different meanings as detailed in gitreference/glossary. (or some
such - though 3/4 are not in the glossary!)
I suggest this as a way of flagging to the reader that they should 'stop
and think' (which we never do if we already have the wrong mental model)
and perhaps go and review the distinctions.
next prev parent reply other threads:[~2020-04-12 10:12 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
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 [this message]
2020-04-13 10:53 ` rupert THURNER
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).