Re: [git-users] Disappearing Config Files

2012-10-03 Thread Jeffery Brewer
That was it. I tried several times to delete it from fix-search, thought I had it a couple of times, but it was still there. When I finally succeeded in deleting it, and then re-added it it seems to be sticking around when I switch between the branches. Thanks! On Wednesday, October 3, 2012 4:1

Re: [git-users] Disappearing Config Files

2012-10-03 Thread PJ Weisberg
On Wed, Oct 3, 2012 at 3:54 PM, Jeffery Brewer wrote: > I have files I move around between several different environments, and in > each environment I have a config file (web.config) that is unique to each > environment. > > I make changes on my machine, push them to a repository, move to a > deve

[git-users] Disappearing Config Files

2012-10-03 Thread Jeffery Brewer
I have files I move around between several different environments, and in each environment I have a config file (web.config) that is unique to each environment. I make changes on my machine, push them to a repository, move to a development machine and "pull" them from the repository, then move

[git-users] Re: fatal: Out of memory, realloc failed

2012-10-03 Thread sourabh pare
Hi Thomas, I tried with your suggested solutions today and it's working fine now. -:) I guess the problem with the configuration only, I installed latest TortoiseGit 1.7.13.0 32bit . Thanks fo

[git-users] Re: Git and Netbeans for Newbies !

2012-10-03 Thread robomatix
Le mercredi 3 octobre 2012 13:47:19 UTC+2, Thomas Ferris Nicolaisen a écrit : > > On Tuesday, October 2, 2012 5:57:13 PM UTC+2, robomatix wrote: > >> Hello ! >> >> I'm a newbie in Git and I want to use it with Netbeans: >> >> I've found these on the web : >> >> http://netbeans.org/kb/docs/ide/gi

[git-users] Re: Git and Netbeans for Newbies !

2012-10-03 Thread Thomas Ferris Nicolaisen
On Tuesday, October 2, 2012 5:57:13 PM UTC+2, robomatix wrote: > Hello ! > > I'm a newbie in Git and I want to use it with Netbeans: > > I've found these on the web : > > http://netbeans.org/kb/docs/ide/git.html > http://git-scm.com/book/fr > > Now, you know I'm french ! > > The previous links hel

Re: [git-users] git svn dcommit after git rebase

2012-10-03 Thread Daniel P. Wright
Simone (Oct03日（Wed）) >> > Hello, I have a git local branch tracking a svn remote branch. I noticed > that if I git rebase that branch onto another local branch (tracking a > different svn remote branch) then the dcommit I do on the first goes to the > remote of the second. IOW > > branches: *fe

[git-users] git svn dcommit after git rebase

2012-10-03 Thread Simone
Hello, I have a git local branch tracking a svn remote branch. I noticed that if I git rebase that branch onto another local branch (tracking a different svn remote branch) then the dcommit I do on the first goes to the remote of the second. IOW branches: *feature1-local* tracks remote svn *fea