Re: [git-users] How tell git-bush which new private key to use

2013-09-12 Thread berd
Hi, >Do you have to keep the test key or you just want to *replace* it with the production key? I want replace the test key to production key. > If replacement is needed, then just overwrite the id_rsa and id_rsa.pub files in your %HOME%\.ssh folder with the new > ones (they migh

Re: [git-users] How tell git-bush which new private key to use

2013-09-12 Thread Konstantin Khomoutov
On Thu, 12 Sep 2013 05:47:07 -0700 (PDT) berd wrote: > >Do you have to keep the test key or you just want to *replace* it > >with the > production key? > > I want replace the test key to production key. Okay. Next time please write your intent clearly -- that would have saved me from typing 6

[git-users] how to commit one line/change only from a branch back to the master?

2013-09-12 Thread GregH
What would be the steps required to achieve this? * create branch to work on a bug "branch1" from "master" * checkout "branch1" * make lots of changes to "branch1" putting in print statements all over the place etc, but then identifying the actual issue & fixing * in summary say then there are 2

Re: [git-users] how to commit one line/change only from a branch back to the master?

2013-09-12 Thread Gergely Polonkai
Cherry picking is your friend here. The easiest way maybe if you add the bug fixing two lines as a separate commit. This way you will only have to cherry pick that only commit. Otherwise, you may add -n to git-cherrypick, so it won't commit the cherry picked commit instantly, but let you investigat

Re: [git-users] how to commit one line/change only from a branch back to the master?

2013-09-12 Thread GregH
ok thanks - I'll read up on cherry picking On Friday, September 13, 2013 6:06:40 AM UTC+10, Gergely Polonkai wrote: > > Cherry picking is your friend here. The easiest way maybe if you add the > bug fixing two lines as a separate commit. This way you will only have to > cherry pick that only com

Re: [git-users] how to commit one line/change only from a branch back to the master?

2013-09-12 Thread Thomas Ferris Nicolaisen
On Thursday, September 12, 2013 10:06:40 PM UTC+2, Gergely Polonkai wrote: > Cherry picking is your friend here. The easiest way maybe if you add the > bug fixing two lines as a separate commit. This way you will only have to > cherry pick that only commit. Otherwise, you may add -n to git-cherr

Re: [git-users] how to commit one line/change only from a branch back to the master?

2013-09-12 Thread Gergely Polonkai
Cherrypick commits by default. You can add -n to prevent it, in which case the picked changes will be staged, and the commit message will be filled with the original commit message. On 13 Sep 2013 08:31, "Thomas Ferris Nicolaisen" wrote: > On Thursday, September 12, 2013 10:06:40 PM UTC+2, Gergel