Re: [git-users] Re: Git for Windows crash (patch.exe) when compiling gstreamer SDK

2013-10-30 Thread Lasse Laursen
Hey Thomas, Thanks for taking the time to reply to me. I guess that is a more suitable forum. Already in a discussion on the GStreamer mailing list without any luck :( Have an awesome day! On Mon, Oct 28, 2013 at 4:01 PM, Thomas Ferris Nicolaisen tfn...@gmail.comwrote: On Monday, October 28,

Re: [git-users] Recommendations on a windows-based GIT environment with a local server

2013-10-30 Thread my . sevenflip
Hi Magnus, Thanks for your reply. So you say we should use a windows network drive or network share on a (server)computer with a normal standard git configuration for now? Why would you not use gitblit? Is there any (easy) way to make sure that only one person may merge to the master/head

Re: [git-users] Recommendations on a windows-based GIT environment with a local server

2013-10-30 Thread Konstantin Khomoutov
On Wed, 30 Oct 2013 02:43:14 -0700 (PDT) my.sevenf...@gmail.com wrote: Thanks for your reply. So you say we should use a windows network drive or network share on a (server)computer with a normal standard git configuration for now? Yes. Just make sure you have transparently working

[git-users] Re: Do I need to track a directory to be able to subtree and push it to a different remote branch?

2013-10-30 Thread Stereokai
I appreciate your reply, and apologize for taking too long to respond. Thank you for your concise explanation as well as connecting me to the Yeoman channel - it would certainly come in handy in the future. Regarding your view about alternative solutions, I completely agree with all of your

Re: [git-users] Another easy merge question

2013-10-30 Thread Eric Fowler
Given that I have already made a commit of my new changes in master (but not a push), is this still the way to go? Eric On Tue, Oct 29, 2013 at 4:43 PM, William Seiti Mizuta william.miz...@gmail.com wrote: Hi Eric, to not lose your changes, you can create a branch which represents your

Re: [git-users] Another easy merge question

2013-10-30 Thread William Seiti Mizuta
If you want to use the changes in the commits after, yes. If you don't need these commits anymore, you can just use git reset --hard origin/master and all your commits that you haven't pushed yet will be almost lost. William Seiti Mizuta @williammizuta Caelum | Ensino e Inovação

Re: [git-users] Re: A few GIT questions.

2013-10-30 Thread Sam Roberts
I don't think you can add desciptions to files, though you can add notes to commits: http://alblue.bandlem.com/2011/11/git-tip-of-week-git-notes.html You have a pretty specific work-flow, I don't think any tool is going to do this out of the box, much less have IDE integration, but using git

Re: [git-users] Another easy merge question

2013-10-30 Thread PJ Weisberg
On Oct 30, 2013 10:40 AM, Eric Fowler eric.fow...@gmail.com wrote: Given that I have already made a commit of my new changes in master (but not a push), is this still the way to go? That'll work fine. You could also do 'git checkout origin/master' to leave your local master branch the way it