From: Petr Baudis <pasky@suse.cz>
To: Junio C Hamano <junkio@cox.net>
Cc: Tom Prince <tom.prince@ualberta.net>, git@vger.kernel.org
Subject: Re: GIT 0.99.7d, and end of week status.
Date: Tue, 27 Sep 2005 12:17:44 +0200 [thread overview]
Message-ID: <20050927101744.GD30889@pasky.or.cz> (raw)
In-Reply-To: <7vll1jh8zr.fsf@assigned-by-dhcp.cox.net>
Dear diary, on Mon, Sep 26, 2005 at 10:25:28PM CEST, I got a letter
where Junio C Hamano <junkio@cox.net> told me that...
> Petr Baudis <pasky@suse.cz> writes:
>
> > ... Either way, git-pull won't be equivalent to git-fetch &&
> > git-merge (or git-resolve or whatever is the core porcelain
> > command) anymore.
>
> "pull = fetch + merge" is a reasonable approximation to use when
> you explain what they are to somebody, but taking it literally
> would harm usefulness.
>
> It is what you have already lived with for a while. "git pull
> .../linux/2.6.git v2.6.11-tree v2.6.12" would fetch both heads
> but merges v2.6.12 head only (because v2.6.11-tree is not
> something you can merge with).
Yes, but that's a rather obscure case. :-) But well, your use cases
convinced me that the behaviour to fetch multiple heads even if you are
going to merge just one of them is useful enough. However, I still think
that the user should be required to specify the to-be-merged head
manually if the default choice isn't explicitly written in the remotes
file.
--
Petr "Pasky" Baudis
Stuff: http://pasky.or.cz/
VI has two modes: the one in which it beeps and the one in which
it doesn't.
next prev parent reply other threads:[~2005-09-27 10:17 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-09-25 8:36 GIT 0.99.7d, and end of week status Junio C Hamano
2005-09-25 9:32 ` Alan Chandler
2005-09-25 18:47 ` Junio C Hamano
2005-09-25 20:43 ` Alan Chandler
2005-09-26 0:01 ` Junio C Hamano
2005-09-26 6:09 ` Alan Chandler
2005-09-26 20:23 ` Junio C Hamano
2005-09-25 22:42 ` Tom Prince
2005-09-25 23:46 ` Junio C Hamano
2005-09-26 19:10 ` Petr Baudis
2005-09-26 20:25 ` Junio C Hamano
2005-09-27 10:17 ` Petr Baudis [this message]
2005-09-29 4:40 ` Matthias Urlichs
2005-09-29 5:11 ` Junio C Hamano
2005-09-26 20:17 ` Jon Loeliger
2005-09-26 22:03 ` Junio C Hamano
2005-09-27 7:38 ` [PATCH] Fix default pull not to do an unintended Octopus Junio C Hamano
2005-09-27 9:52 ` Josef Weidendorfer
2005-09-27 12:54 ` Petr Baudis
2005-09-27 14:35 ` Josef Weidendorfer
2005-09-27 22:24 ` Junio C Hamano
2005-09-27 10:13 ` GIT 0.99.7d, and end of week status Petr Baudis
2005-09-27 9:51 ` Petr Baudis
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=20050927101744.GD30889@pasky.or.cz \
--to=pasky@suse.cz \
--cc=git@vger.kernel.org \
--cc=junkio@cox.net \
--cc=tom.prince@ualberta.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.
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).