From: rupert THURNER <email@example.com>
To: Philip Oakley <firstname.lastname@example.org>
Cc: Johannes Sixt <email@example.com>, Git Mailing List <firstname.lastname@example.org>
Subject: Re: configure remote/local as mine/theirs
Date: Mon, 13 Apr 2020 12:53:09 +0200 [thread overview]
Message-ID: <CAJs9aZ_Rs8k1Uv-jn-YHCmRaM6kWipcucTCTeE44-BT3ssnNhQ@mail.gmail.com> (raw)
On Sun, Apr 12, 2020 at 12:12 PM Philip Oakley <email@example.com> wrote:
> On 11/04/2020 22:40, Johannes Sixt wrote:
> > Am 11.04.20 um 14:51 schrieb rupert THURNER:
> >> 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.
thank you for the nice explanation! there would be no easy
way to swap the names in the rebase case? or introduce
a new one, "mine"?
> 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!)
philip, maybe phrase it as johannes did, add it to the man pages
of rebase, and mergetool? the change you consider "theirs" is
actually "ours", swapped for technical reasons when rebasing.
prev parent reply other threads:[~2020-04-13 10:59 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
2020-04-13 10:53 ` rupert THURNER [this message]
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).