From: rupert THURNER <rupert.thurner@gmail.com>
To: git@vger.kernel.org
Subject: configure remote/local as mine/theirs
Date: Sat, 11 Apr 2020 14:51:15 +0200 [thread overview]
Message-ID: <CAJs9aZ-iXUtZoumnMzTFPrc=mtz2+s4EDUKhxw_KQp42h3mxBw@mail.gmail.com> (raw)
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 reply other threads:[~2020-04-11 12:51 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-11 12:51 rupert THURNER [this message]
2020-04-11 21:40 ` configure remote/local as mine/theirs Johannes Sixt
2020-04-12 10:12 ` Philip Oakley
2020-04-13 10:53 ` rupert THURNER
Reply instructions:
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:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
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 \
--in-reply-to='CAJs9aZ-iXUtZoumnMzTFPrc=mtz2+s4EDUKhxw_KQp42h3mxBw@mail.gmail.com' \
--to=rupert.thurner@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* 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
https://80x24.org/mirrors/git.git
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).