From: "Shawn O. Pearce" <spearce@spearce.org>
To: Geoff Russell <geoffrey.russell@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: Merging into a current branch
Date: Mon, 30 Jul 2007 01:48:37 -0400 [thread overview]
Message-ID: <20070730054837.GS20052@spearce.org> (raw)
In-Reply-To: <93c3eada0707292240qe92aa57s5c5152e078693a53@mail.gmail.com>
Geoff Russell <geoffrey.russell@gmail.com> wrote:
> Is there any reason why
>
> git fetch origin branchX:branchX
>
> fails if I am on branchX? All I want to do is fast forward it.
Yes.
A fetch will *only* update the branch. If the branch is your current
branch it won't update the working directory. This safety check
is to prevent the branch from updating, but the working directory
staying unchanged, and the resulting git-status output looking like
you just undid all of the recent work done on branchX of origin.
Try git-pull instead:
git pull origin branchX
--
Shawn.
prev parent reply other threads:[~2007-07-30 5:48 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-07-30 5:40 Merging into a current branch Geoff Russell
2007-07-30 5:48 ` Shawn O. Pearce [this message]
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=20070730054837.GS20052@spearce.org \
--to=spearce@spearce.org \
--cc=geoffrey.russell@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).