From: "Santi Béjar" <sbejar@gmail.com>
To: "Junio C Hamano" <junkio@cox.net>
Cc: "Josef Weidendorfer" <Josef.Weidendorfer@gmx.de>,
"Aneesh Kumar K.V" <aneesh.kumar@gmail.com>,
"Johannes Schindelin" <Johannes.Schindelin@gmx.de>,
git@vger.kernel.org
Subject: Re: git pull and merging.
Date: Fri, 8 Dec 2006 03:04:21 +0100 [thread overview]
Message-ID: <8aa486160612071804t63a86b5ate6b17d8ddcf90a60@mail.gmail.com> (raw)
In-Reply-To: <7vac1zqpa3.fsf@assigned-by-dhcp.cox.net>
On 12/8/06, Junio C Hamano <junkio@cox.net> wrote:
> Junio C Hamano <junkio@cox.net> writes:
>
> > Once you place something like "branch.*.merge" in configuration
> > file (either $GIT_DIR/config, or a $GIT_DIR/remotes/* file), you
> > are talking about other repositories you regularly interact
> > with, so it might be probably Ok to require the user to use a
> > tracking branch if he wants the convenience of "branch.*.merge",
> > and make its value name the local tracking branch instead of the
> > remote branch.
>
> In other words, I am all for fixing this.
>
> Although it may not hurt too much if we just redefine the
> meaning of it to name the local tracking branch, using a
> different name "branch.*.defaultmerge" is safer and would not
> break existing repositories.
Or branch.*.localmerge?
next prev parent reply other threads:[~2006-12-08 2:04 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-12-06 4:51 git pull and merging Aneesh Kumar
2006-12-06 5:02 ` Junio C Hamano
2006-12-06 5:21 ` Aneesh Kumar
2006-12-06 9:26 ` Johannes Schindelin
2006-12-06 10:00 ` Peter Baumann
2006-12-06 10:14 ` Johannes Schindelin
2006-12-06 10:23 ` Peter Baumann
2006-12-06 10:05 ` Aneesh Kumar
2006-12-06 10:28 ` Jakub Narebski
[not found] ` <cc723f590612060236k7839942el8d048eedfdee3682@mail.gmail.com>
[not found] ` <cc723f590612060248y6f730a54l3a2aadfa6500d36d@mail.gmail.com>
2006-12-06 10:48 ` Fwd: " Aneesh Kumar
2006-12-06 16:44 ` Josef Weidendorfer
2006-12-07 6:46 ` Aneesh Kumar K.V
2006-12-07 11:27 ` Josef Weidendorfer
2006-12-07 19:06 ` Junio C Hamano
2006-12-07 22:54 ` Josef Weidendorfer
2006-12-08 1:56 ` Santi Béjar
2006-12-08 17:23 ` Josef Weidendorfer
2006-12-08 19:12 ` [PATCH] Add branch.*.localmerge and documentation update Josef Weidendorfer
2006-12-08 20:52 ` Santi Béjar
2006-12-08 21:38 ` Junio C Hamano
2006-12-08 21:48 ` Jakub Narebski
2006-12-08 22:01 ` Josef Weidendorfer
2006-12-08 22:34 ` Junio C Hamano
2006-12-08 23:17 ` Josef Weidendorfer
2006-12-08 23:41 ` Junio C Hamano
2006-12-09 1:28 ` [PATCH] Add branch.*.merge warning " Josef Weidendorfer
2006-12-09 16:14 ` Santi Béjar
2006-12-08 21:39 ` [PATCH] Add branch.*.localmerge " Josef Weidendorfer
2006-12-08 22:15 ` Santi Béjar
2006-12-08 20:09 ` git pull and merging Santi Béjar
2006-12-08 7:07 ` Junio C Hamano
2006-12-07 23:06 ` Junio C Hamano
2006-12-08 2:04 ` Santi Béjar [this message]
2006-12-08 11:48 ` Jakub Narebski
2006-12-06 9:31 ` Jakub Narebski
2006-12-06 9:58 ` Johannes Schindelin
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=8aa486160612071804t63a86b5ate6b17d8ddcf90a60@mail.gmail.com \
--to=sbejar@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=Josef.Weidendorfer@gmx.de \
--cc=aneesh.kumar@gmail.com \
--cc=git@vger.kernel.org \
--cc=junkio@cox.net \
/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.
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 NNTP newsgroup(s).