[git-users] Deploying to remote...

2013-01-24 Thread Bryce Martin
I'm new to git, so be gentle. I'm missing something with deploying a repo to a remote. Here is the scenario... I'm hosting a private repo on Bitbucket. I pulled the repo down to a c9.io workspace, essentially its just a local copy (but local to their vm running my dev environment)... anyway.

[git-users] Re: Deploying to remote...

2013-01-24 Thread Thomas Ferris Nicolaisen
It always helps to get a good view of the history in question here. First to a git fetch heroku to get the latest on what's up there. Then do either do command line style: git log --graph --oneline --decorate --all Or fire up gitk for all (also remote) branches: gitk --all Does it become a l

Re: [git-users] Deploying to remote...

2013-01-24 Thread Konstantin Khomoutov
On Thu, 24 Jan 2013 06:41:32 -0800 (PST) Bryce Martin wrote: [...] > Now, I made some changes to my > local copy and have all of the changes committed. My working copy is > clean. I want to push it up to heroku... what I really want is for > it to accept the push and automatically merge the cha

[git-users] add the code file by other write,and keep others know it's written by him in commit log

2013-01-24 Thread lei yang
Hi if want to add foo.c to my git repos ,I want to keep others know foo.c is written by phil, and better to leave the origin commit message.how could I do? note: I can't use format-patch, because they have different path for this file. Thanks Lei --

[git-users] acked by ,test by, how to add them. automatically? and what does it mean

2013-01-24 Thread lei yang
Hie experts, see below commit: commit abb959f8a3f125a6e6641abbd020111516dfc8f6 Author: Javi Merino Date: Fri Dec 16 16:04:36 2011 +0100 ARM: 7237/1: PL330: Fix driver freeze Add a req_running field to the pl330_thread to track which request (if any) has been submitted to the DMA.

Re: [git-users] add the code file by other write,and keep others know it's written by him in commit log

2013-01-24 Thread Konstantin Khomoutov
On Fri, 25 Jan 2013 00:36:02 +0800 lei yang wrote: > if want to add foo.c to my git repos ,I want to keep others know foo.c > is written by phil, and better to leave the origin commit message.how > could I do? I'm not sure I was able to parse the question correctly, but it seems you want to comm

Re: [git-users] add the code file by other write,and keep others know it's written by him in commit log

2013-01-24 Thread lei yang
On Fri, Jan 25, 2013 at 12:46 AM, Konstantin Khomoutov wrote: > On Fri, 25 Jan 2013 00:36:02 +0800 > lei yang wrote: > >> if want to add foo.c to my git repos ,I want to keep others know foo.c >> is written by phil, and better to leave the origin commit message.how >> could I do? > > I'm not sure

Re: [git-users] acked by ,test by, how to add them. automatically? and what does it mean

2013-01-24 Thread John McKown
I can only answer #1. "Acked-by" is a normal (in English) way to say "Acknowledged by". This is perhaps the first stage so that people to later pull know that Linaro has seen the change and that they are looking it over. The "Tested-By" is the same. Neither of this is a normal git function. I would

[git-users] Re: How to convert SVN tags to Git

2013-01-24 Thread Luís de Sousa
Hello everyone, For future reference, the full account of how dealt with this issue can be read my blog[1]. Thank you all for the guidance to this solution, Luís [1] http://attheedgeoftime.blogspot.com/2013/01/migrate-svn-repository-to-git.html --

Re: [git-users] Re: How to convert SVN tags to Git

2013-01-24 Thread Konstantin Khomoutov
On Thu, Jan 24, 2013 at 01:37:54PM -0800, Luís de Sousa wrote: > For future reference, the full account of how dealt with this issue can be > read my blog[1]. > > Thank you all for the guidance to this solution, Thanks for summarising and sharing. That's a really good practice. --

[git-users] back to old version

2013-01-24 Thread adriano
Hy Today I commited two Java classes, but I didn't push.. how can I exclude my commit? I want my code like before my commit... I use e-git in eclipse.. but i can use git command line too.. Thanks! Adriano Schmidt http://www.localhost8080.com.br

[git-users] e-git

2013-01-24 Thread adriano
Hy How can I make a merge in eclipse e-git? The link "Mark as merged" doesn't works.. Nothing changes when I clicked this link... Thanks! Adriano Schmidt http://www.localhost8080.com.br

Re: [git-users] back to old version

2013-01-24 Thread John McKown
git reset HEAD^ You might to look at the --hard or --soft options. On Jan 24, 2013 8:35 PM, wrote: > Hy > > Today I commited two Java classes, but I didn't push.. > > how can I exclude my commit? I want my code like before my commit... > > I use e-git in eclipse.. but i can use git command line