From: Johan 't Hart <johanthart@gmail.com>
To: Francis Moreau <francis.moro@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: Question about "git pull --rebase"
Date: Sun, 15 Nov 2009 20:47:56 +0100 [thread overview]
Message-ID: <4B005AEC.1000002@gmail.com> (raw)
In-Reply-To: <m2my2noo0g.fsf@gmail.com>
Francis Moreau schreef:
> Looks like you did :)
>
> I've been somehow confused by the git-pull man page, which says:
>
> A parameter <ref> without a colon is equivalent to <ref>: when
> pulling/fetching, so it merges <ref> into the current branch without
> storing the remote branch anywhere locally
>
> So I thought that both of the commands were equivalent for 'git pull
> --rebase'.
>
> Thanks for the explanation.
Ah that part.
It means that
$ git pull --rebase origin master
means the same as:
$ git pull --rebase origin master:
(note extra colon at the end)
But not as:
$ git pull --rebase origin master:foo
It means that, when you give a refspec without a colon, it is the same
as the refspec with the colon and without the right side.
next prev parent reply other threads:[~2009-11-15 19:48 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-11-14 20:39 Question about "git pull --rebase" Francis Moreau
2009-11-14 23:16 ` Nanako Shiraishi
2009-11-15 14:31 ` Francis Moreau
2009-11-14 23:29 ` Johan 't Hart
2009-11-15 14:34 ` Francis Moreau
2009-11-15 19:47 ` Johan 't Hart [this message]
2009-11-15 20:18 ` Junio C Hamano
2009-11-15 20:32 ` Johan 't Hart
2009-11-16 12:00 ` Francis Moreau
2009-11-16 12:17 ` Francis Moreau
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=4B005AEC.1000002@gmail.com \
--to=johanthart@gmail.com \
--cc=francis.moro@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.
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).