From: Junio C Hamano <gitster@pobox.com>
To: Andreas Ericsson <ae@op5.se>
Cc: Kyle Rose <krose@krose.org>, git mailing list <git@vger.kernel.org>
Subject: Re: new to git
Date: Mon, 27 Aug 2007 13:39:03 -0700 [thread overview]
Message-ID: <7vabsczp94.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <46D33290.20405@op5.se> (Andreas Ericsson's message of "Mon, 27 Aug 2007 22:22:40 +0200")
Andreas Ericsson <ae@op5.se> writes:
> git pull = git fetch + git merge. The notation you use above is obsoleted
> and no longer works in git 1.5.3. Instead you'd have to replace
>
> git pull . foo
>
> with
>
> git merge foo
>
> which will most likely clear up some confusion.
Huh? "git pull . foo" has always been the same as "git merge
foo", I thought... Have we broken anything?
>> (2) Any way to disable this warning:
>>
>> Warning: No merge candidate found because value of config option
>> "branch.local.merge" does not match any remote branch fetched.
>>
>
> Yes. Edit your .git/config file to add a merge candidate for your local
> branch.
Or, say what branch you get from the remote you want to merge
explicitly. You may not always merge the same branch from the
remote. E.g.
$ git pull origin experimental
$ git pull origin master
>> (4) I'm still not clear on when a dst should and should not be used in a
>> refspec. It appears that one can only do non-fast forward updates to
>> the branch that is checked out (which makes sense, since you may need to
>> resolve), but other than that, what is the difference between
>>
>> git checkout foo
>> git pull . master
>>
>> and
>>
>> git checkout master
>> git push . master:foo
>>
>> ?
>>
>
> Here I'm clueless, except that this matches old syntax which is no longer
> valid.
Huh again about "no longer valid" part.
In any case, the former says "I am on foo branch, and I want to
merge 'master' from _MY_ local repository". The latter says "I
want to update the local branch 'foo' with what is in my
'master' branch, both local". They are totally different.
Please do _not_ spread backward incompatibility FUD.
next prev parent reply other threads:[~2007-08-27 20:39 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-08-27 19:43 new to git Kyle Rose
2007-08-27 20:11 ` J. Bruce Fields
2007-08-27 20:22 ` Andreas Ericsson
2007-08-27 20:36 ` Kyle Rose
2007-08-27 20:39 ` Junio C Hamano [this message]
2007-08-27 21:14 ` Andreas Ericsson
2007-09-05 5:56 ` Jan Hudec
2007-09-05 6:54 ` Junio C Hamano
-- strict thread matches above, loose matches on Subject: below --
2011-04-08 19:43 New " Marco Maggesi
2011-04-08 20:10 ` Jeff King
2011-04-09 19:15 ` Marco Maggesi
2011-04-09 19:35 ` Dmitry Potapov
2011-04-09 22:41 ` Matthieu Moy
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=7vabsczp94.fsf@gitster.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=ae@op5.se \
--cc=git@vger.kernel.org \
--cc=krose@krose.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).