git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Pavel Roskin <proski@gnu.org>
To: git <git@vger.kernel.org>
Subject: Switching between branches
Date: Wed, 20 Apr 2005 21:42:39 -0400	[thread overview]
Message-ID: <1114047759.20044.22.camel@dv> (raw)

Hello!

Perhaps it's a naive question, but how do I switch between branches?  I
mean an equivalent of "svn switch" or "cvs update -r branch" that would
reuse the existing working directory.

I tried to switch a git-pasky working directory to the linus branch.

Here's what I tried:

git track linus
git cancel
git pull
git cancel
git merge linus
git cancel

After all that I found that README is still from the pasky branch.

Then I tried "git merge -b pasky linus" - this actually changed the
files to the linus branch, but it didn't remove files specific to
git-pasky.  Also, I'm surprised that I had to specify "-b pasky", as if
the currently checked out branch is unknown.

I'm using git-pasky 0.6.2.

-- 
Regards,
Pavel Roskin


             reply	other threads:[~2005-04-21  1:38 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2005-04-21  1:42 Pavel Roskin [this message]
2005-04-21  7:31 ` Switching between branches Petr Baudis
2005-04-21 14:12   ` Matthias Urlichs
2005-04-21 16:39     ` 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

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1114047759.20044.22.camel@dv \
    --to=proski@gnu.org \
    --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).