git push origin BRANCHNAME question

2016-08-25 Thread Ed Greenberg
I think I understand this from the git-push man page, but I want to make 
sure:


I have two branches, master and develop.

If I am (accidentally) sitting on master, and issue 'git push origin 
develop', does this properly push develop to remote develop, or does it 
push master to remote develop (which seems to be bad, in the most common 
use case.)  ?


Thanks,

Ed


--
Ed Greenberg
Glens Falls, NY USA

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


git push origin BRANCHNAME question

2016-08-25 Thread Ed Greenberg
I think I understand this from the git-push man page, but I want to make 
sure:


I have two branches, master and develop.

If I am (accidentally) sitting on master, and issue 'git push origin 
develop', does this properly push develop to remote develop, or does it 
push master to remote develop (which seems to be bad, in the most common 
use case.)  ?


Thanks,

Ed


--
Ed Greenberg
Glens Falls, NY USA

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


Problem with two copies of same branch diverging

2016-08-04 Thread Ed Greenberg

Hi, Thanks for reading my question.

I have two copies of code checked out at the same branch. Desktop and 
remote server.


I use an IDE that automatically SFTP transfers each save from the 
desktop to the remote server, so I can run my changes on the server 
environment.


At the end of the session, I commit the code on my desktop, do a git 
push to the repo.


When I look at the server, the code there is identical to what's on my 
desktop box and what I just comitted and pushed, but, of course, git 
status thinks it's all modified and wants me to either commit it or 
stash it.  In fact, doing a git log on the server doesn't show my latest 
push.  So I need to pull the changes, but I can't because I have pending 
stuff.


What's a good git workflow for this save-upload-remote test cycle?

Thanks,

--
Ed Greenberg
Glens Falls, NY USA

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html