From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Junio C Hamano <junkio@cox.net>
Cc: git@vger.kernel.org
Subject: Re: Multi-head fetches, pulls, and a King Ghidorah
Date: Fri, 19 Aug 2005 11:14:54 +0200 (CEST) [thread overview]
Message-ID: <Pine.LNX.4.63.0508191039460.11916@wgmdd8.biozentrum.uni-wuerzburg.de> (raw)
In-Reply-To: <7vy86y1ibg.fsf@assigned-by-dhcp.cox.net>
Hi,
If I understand correctly, the multi-head fetch would not write any ref if
used like this:
git fetch remote:repository/ head tail
but it would try a fast-forward when used like this:
git fetch remote:repository/ head:head tail:tail
Correct? If yes: This is fantastic! It obsoletes my dumb script.
On Fri, 19 Aug 2005, Junio C Hamano wrote:
> However, suppose then I were Joe Random, an individual netdev
> contributor who is interested in these two netdev branches.
> Upon seeing the pull request, I might decide it is a good time
> to get changes from there, my upstream.
>
> $ git pull jgarzik/netdev-2.6.git/ sis190:sis190 e100:e100
>
> Because I am keeping track of copies of these two branches, I
> use "sis190:sis190 e100:e100" to update my local heads.
I propose a "--separate" flag to git pull. This would do exactly the same
as a plain git pull, but for each fetched branch which could not be
fast-forwarded
- try to switch to the branch (dying if it is not the current,
and the working tree is dirty)
- try a merge
- if the merge fails, reset the branch to original state,
write out a temporary head and output a warning
After that, it would switch back to the original branch and check that
out.
For all failed merges, the user needs to "git resolve" (the exact command
line could be output by "git pull --separate").
Ciao,
Dscho
next prev parent reply other threads:[~2005-08-19 9:15 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-08-19 7:45 Multi-head fetches, pulls, and a King Ghidorah Junio C Hamano
2005-08-19 9:14 ` Johannes Schindelin [this message]
2005-08-19 10:25 ` Junio C Hamano
2005-08-20 3:07 ` My GIT Day Junio C Hamano
2005-08-20 11:02 ` 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
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=Pine.LNX.4.63.0508191039460.11916@wgmdd8.biozentrum.uni-wuerzburg.de \
--to=johannes.schindelin@gmx.de \
--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.
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).