git working on two branches simultaneously

问题:

I have a project with many branches.

I would like to work on several branches simultaneously without switching back and forth with git checkout.

Is there any way I can do that besides copying the whole repository somewhere else?

回答1:

Git 2.5+ (Q2 2015) will support that feature: Once you have cloned a git repo, you will be able to checkout multiple branches in different path with the new command git worktree add <path> [<branch>].

That replaces an older script contrib/workdir/git-new-workdir, with a more robust mechanism where those "linked" working trees are actually recorded in the main repo new $GIT_DIR/worktrees folder (so that work on any OS, including Windows).

Again, once you have cloned a repo (in a folder like /path/to/myrepo), you can add worktrees for different branches in different independent paths (/path/to/br1, /path/to/br2), while having those working trees linked to the main repo history (no need to use a --git-dir option anymore)

See more at "Multiple working directories with Git?".

And once you have created a worktree, you can move or remove it (with Git 2.17+, Q2 2018).

回答2:

Take a look at $GIT_SRC_DIR/contrib/workdir/git-new-workdir.

a simple script to create a working directory that uses symlinks to point at an exisiting repository. This allows having different branches in different working directories but all from the same repository.

回答3:

I suggest my small script http://www.redhotchilipython.com/en_posts/2013-02-01-clone-per-feature.html

It will do git clone and replace the config (to "look" at original repo, so pull/push will go into "main" repo) basically, but it's simple enough to serve an abstraction from actual bootstrapping.

回答4:

Git supports multiple worktree at the same time. For more information see:

• Multiple working directories with Git?
• https://git-scm.com/docs/git-worktree

How ever it is very hard to support multiple worktree with IDs. For example this is an enhancement request in JGet (eclipse ID) to support worktree.

So, you have to manage project manually (command line) with lots of problems or work with a single worktree in an IDE.

回答5:

Like our friend VonC said five months ago, now there is a new feature since version 2.5.x that does the job. git worktree.

回答6:

Not really as Git only supports to have one working copy of the repository data within the repository directory.

If you want to commit/pull to the same repository with two different working copies, you could create a bare repository and clone it to two working copies.

Whenever you have finished something, you simply push to the "main" bare repository.

Some hints:

man git-clone

git clone --bare