Re: [git-users] Re: HELP! stash pop is failing and I can't get my work out

2013-03-11 Thread Thomas Ferris Nicolaisen
On Monday, March 11, 2013 3:55:14 AM UTC+1, David wrote: On 11/03/2013, Konstantin Khomoutov flat...@users.sourceforge.netjavascript: wrote: On Sat, 9 Mar 2013 13:52:14 -0800 (PST) Thomas Ferris Nicolaisen tfn...@gmail.com javascript: wrote: If you google the error message, my

[git-users] Re: Rewriting references to existing commits in commit messages with filter-branch

2013-03-11 Thread Thomas Ferris Nicolaisen
On Monday, March 11, 2013 1:30:07 AM UTC+1, Vadim Zeitlin wrote: Hello, I'm in the process of converting an existing svn repository to git. The first step was a standard git svn clone that went successfully (after taking 15 hours to complete). However I don't want to stop there and would

Re: [git-users] Re: HELP! stash pop is failing and I can't get my work out

2013-03-11 Thread Konstantin Khomoutov
On Mon, 11 Mar 2013 13:55:14 +1100 David bouncingc...@gmail.com wrote: If you google the error message, my explanation here is the 4th hit: http://blog.tfnico.com/2012/09/git-stash-blooper-could-not-restore.html Thanks for sharing -- this was an interesting read. Unfortunately, the

Re: [git-users] Re: HELP! stash pop is failing and I can't get my work out

2013-03-11 Thread David
On 11/03/2013, Thomas Ferris Nicolaisen tfn...@gmail.com wrote: On Monday, March 11, 2013 3:55:14 AM UTC+1, David wrote: On 11/03/2013, Konstantin Khomoutov flat...@users.sourceforge.netjavascript: wrote: On Sat, 9 Mar 2013 13:52:14 -0800 (PST) Thomas Ferris Nicolaisen tfn...@gmail.com

[git-users] git clone --bare my_project my_project.git

2013-03-11 Thread Thota Madhu Sudhan Rao
I am reading git book the link is given below http://git-scm.com/book/en/Git-on-the-Server-Getting-Git-on-a-Server I did this git clone --bare my_project my_project.git then I got the following error fatal: repository 'my_project' does not exist then I created a folder and started the same but

Re: [git-users] git clone --bare my_project my_project.git

2013-03-11 Thread Konstantin Khomoutov
On Mon, 11 Mar 2013 06:34:50 -0700 (PDT) Thota Madhu Sudhan Rao madhu131...@gmail.com wrote: I am reading git book the link is given below http://git-scm.com/book/en/Git-on-the-Server-Getting-Git-on-a-Server I did this git clone --bare my_project my_project.git then I got the following

[git-users] create a new branch with the contents from current branch's dir

2013-03-11 Thread lei yang
Hi experts, Branch A content is lyang001@lyang001-OptiPlex-9010:~/meta-networking$ ls README recipes-connectivity recipes-daemons recipes-filter recipes-protocols recipes-support sub.sh xx.sh I want to create a new branch named support and make it contain recipes-support (recipes-support

Re: [git-users] git clone --bare my_project my_project.git

2013-03-11 Thread Rahmat Budiharso
What happens is just like the error message said, that is repository 'my_project' doesn't exists. Git clone is used to duplicate an existing repository, which it's looks like you don't have one. Merely creating the directory is not enough, you have to create the repository using 'git init .'

Re: [git-users] create a new branch with the contents from current branch's dir

2013-03-11 Thread Konstantin Khomoutov
On Mon, 11 Mar 2013 22:05:47 +0800 lei yang yanglei.f...@gmail.com wrote: Branch A content is lyang001@lyang001-OptiPlex-9010:~/meta-networking$ ls README recipes-connectivity recipes-daemons recipes-filter recipes-protocols recipes-support sub.sh xx.sh I want to create a new

[git-users] Reset branch to master after merge

2013-03-11 Thread Paul Smith
I've been searching but I've not found anyone else asking about this. In my workflow I tend to do a bunch of work on a topic branch, merge it to master, then do some other things and come back a few weeks later and pick it up again. Obviously when I start working on it again I want to start

Re: [git-users] Reset branch to master after merge

2013-03-11 Thread Ryan Hodson
Paul, It sounds like you have one of two options: 1) Use the topic branch as a short-lived branch that just serves as an isolated environment for you to do some work on a particular feature. This means you would delete it as soon as you merge it into master, because that feature is done, at

[git-users] Connecting to Bitbucket from Amazon EC2 Server.

2013-03-11 Thread Thota Madhu Sudhan Rao
Hi I am using Bitbucket and I am able to connect via my local server (my comp is windows 7) and I am doing push,pull,merge and other things.Great! I have an Amazon EC2 Ubuntu Server,where I each time have to update the code.So I am using git clone

Re: [git-users] Reset branch to master after merge

2013-03-11 Thread Paul Smith
On Mon, 2013-03-11 at 10:54 -0500, Ryan Hodson wrote: 1) Use the topic branch as a short-lived branch that just serves as an isolated environment for you to do some work on a particular feature. This means you would delete it as soon as you merge it into master, because that feature is done,

Re: [git-users] Reset branch to master after merge

2013-03-11 Thread Ryan Hodson
Yea, that last bit is a bit outside the norm, and yes, I'm saying that you should just delete it and recreate it later on. It basically has the same effect as resetting it to master, but it's less hassle and you don't have an extra topic branch laying around. What I was getting at was that this

Re: [git-users] Connecting to Bitbucket from Amazon EC2 Server.

2013-03-11 Thread Thota Madhu Sudhan Rao
Thanks a lot,it worked.You explained me greatly. On Monday, 11 March 2013 22:35:01 UTC+5:30, William Seiti Mizuta wrote: First thing: you don't need to use command git init. You only need to use the command git clone. Second thing: did you create the private and public key? And if you did,

Re: [git-users] Reset branch to master after merge

2013-03-11 Thread Philip Oakley
- Original Message - From: Paul Smith To: git-users@googlegroups.com Sent: Monday, March 11, 2013 3:33 PM Subject: [git-users] Reset branch to master after merge I've been searching but I've not found anyone else asking about this. In my workflow I tend to do a bunch of