Git create branch from current checked out master?

git version-control dvcs git-branch
corydoras picture corydoras · Sep 21, 2009 · Viewed 95.2k times · Source

There is a git controlled folder on a server where the main branch is checked out and a whole pile of files have been modified and not committed. Is there a way for me to commit the changes to a separate branch so I can go back to a clean version?

ie I want to effecitvely undo all this persons changes but store them in another chance so if that person wants their changes they can switch to that branch.

(Yes I know this is not how git is designed to work but that is my situation!) Any ideas very much appreciated.

Answer

CB Bailey picture CB Bailey · Sep 21, 2009

First of all moving to a different branch based in the current HEAD is performed like this:

git checkout -b newbranch

Commit all the changes (assuming no newly added files, otherwise git add them):

git commit -a

Go back to the master branch:

git checkout master

The previously uncommitted changes will all be on the newbranch branch, and master will still be at the state it was without those changes.

Related questions

Undo working copy modifications of one file in Git?

After the last commit, I modified a bunch of files in my working copy, but I want to undo the changes to one of those files, as in reset it to the same state as the most recent commit. However, …

Read More
What is the Difference Between Mercurial and Git?

I've been using git for some time now on Windows (with msysGit) and I like the idea of distributed source control. Just recently I've been looking at Mercurial (hg) and it looks interesting. However, I can't wrap my head around …

Read More
How can I stop .gitignore from appearing in the list of untracked files?

I just did a git init on the root of my new project. Then I created a .gitignore file. Now, when I type git status, .gitignore file appears in the list of untracked files. Why is that?

Read More