ansaurus

Question

Git create branch from current checked out master?

Answer 1

+3 A:

You can always stash your changes.

git stash
git checkout -b bravenewmaster
git stash apply

Also keep in mind, that if you commit to the "wrong" branch you can always move that branch back, because branch is nothing but a pointer to a commit.

Michael Krelin - hacker 2009-09-21 06:45:13

Why bother to stash if you're going to immediately re-apply the same changes? You may as well just do `git checkout -b bravenewmaster`. It's less typing and won't touch all the changed files unnecessarily.

Charles Bailey 2009-09-21 06:54:48

Well, I haven't tried, but I assumed that `git` for whatever reason doesn't let `git checkout -b` when there are changes. Otherwise, why question? ;-)

Michael Krelin - hacker 2009-09-21 07:03:57

Actually, for what I can tell by "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" remark — stashing alone should be sufficient with no branching and applying.

Michael Krelin - hacker 2009-09-21 07:05:30

If he's storing the changes (rather than 'stashing' temporarily) then it's probably more appropriate to have a commit (with a message) on a named branch than an stash that musn't be accidentally dropped. Both would work, though.

Charles Bailey 2009-09-21 07:15:46

Of course I can't fully understand other people's intentions, but got a feeling that "I want to work on this instance, but you modified the hell of it, would you sidestep please and deal with it yourself later" ;-)

Michael Krelin - hacker 2009-09-21 07:24:47

Seems slightly convoluted but heck it works too (:

corydoras 2009-09-21 08:34:38

Answer 2

+8 A:

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.

Charles Bailey 2009-09-21 06:52:28

*Explanation:* contents of working repository and staged changes do not belong to any branch. Simple creating new branch off HEAD (last revision) is sufficient for the new commit to go on just created branch `<newbranch>`.

Jakub Narębski 2009-09-21 07:52:20

Thanks guys, I thought switching to a new branch might wipe away the changes. Coming from an SVN background I didn't think switching like this was possible. Testing it out now.

corydoras 2009-09-21 08:29:37

Perfect, did exctly as you say! Git is slightly cool (:

corydoras 2009-09-21 08:33:40

ansaurus

tags:

views:

answers:

Git create branch from current checked out master?

related questions