[git-users] Replace master with another branch.

2010-03-14 Thread vfclists
I have the master and a branch of my project checked out into different directories. I want to make one of the branchesthe new master, which I think I can achieve by copying the contents of the branch's working directory into the master's, committing and pushing. Is there some way to do that by

[git-users] Re: Stashing the commit log

2010-03-14 Thread Konstantin Khomoutov
On Mar 13, 6:33 am, KaibutsuX wrote: > This is all on the master branch. > > I guess what I'm looking for is a way to do a stash, but not only > stash the file diffs, but also any commits that were made. > > If that doesn't make sense, here's a very simple example of what I > usually do at work:

[git-users] Re: Replace master with another branch.

2010-03-14 Thread Konstantin Khomoutov
On Mar 15, 3:12 am, vfclists wrote: > I have the master and a branch of my project checked out into > different directories. > > I want to make one of the branchesthe new master, which I think I can > achieve by copying the contents of the branch's working directory into > the master's, committing