Re: commit problem

2012-09-24 Thread Sebastian Kügler
On Tuesday, September 25, 2012 06:26:15 Reza Shah wrote: > Thanks, yesterday talked with Marco at #plasma and managed to solve this. A short note that it's solved would have been nice in this case, it saves others some time. Cheers, -- sebas http://www.kde.org | http://vizZzion.org | GPG Key I

Re: commit problem

2012-09-24 Thread Reza Shah
Hi Aaron, Thanks, yesterday talked with Marco at #plasma and managed to solve this. Regards, Reza On Mon, Sep 24, 2012 at 11:18 PM, Aaron J. Seigo wrote: > On Monday, September 24, 2012 10:06:44 Reza Shah wrote: >> And later how to merge this to master? Does 'git cherry-pick sha' when >> i'm at

Re: commit problem

2012-09-24 Thread Aaron J. Seigo
On Monday, September 24, 2012 10:06:44 Reza Shah wrote: > And later how to merge this to master? Does 'git cherry-pick sha' when > i'm at master enough? you need to `git push` again after the cherry pick. a cherry pick, like any git change set, is made locally only and you have to tell git to cop

commit problem

2012-09-23 Thread Reza Shah
Hi, I did commit and pushed my changes at home (sha is 2cb3da8528549db525f75af992dd6afda36fc84f) to branch KDE/4.9. For this review request: https://git.reviewboard.kde.org/r/106541/ But at the office when i pulled from this branch nothing changed. 'git show 2cb3da8528549db525f75af992dd6afda36fc8