Re: [git-users] git replace

2014-09-15 Thread Alcolo Alcolo
Le lundi 15 septembre 2014 23:34:52 UTC+2, Dale Worley a écrit : > > > From: Alcolo Alcolo > > > > My git history is complex and it's a nightmare to rebase from old > commits. > > I'm not sure what you're attempting to do, but this might help. It's > a rebasing script I wrote. It appears th

Re: [git-users] git replace

2014-09-15 Thread Dale R. Worley
> From: Alcolo Alcolo > My git history is complex and it's a nightmare to rebase from old commits. I'm not sure what you're attempting to do, but this might help. It's a rebasing script I wrote. It appears that it was based on something Junio wrote. The concept is that it rebases the current

Re: [git-users] ssh keys

2014-09-15 Thread Konstantin Khomoutov
On Tue, 9 Sep 2014 01:48:23 -0700 (PDT) j...@norricorp.f9.co.uk wrote: > I have run ssh-keygen to generate a rsa key which I pasted to the > authorized_keys file fore the git user on the git server. And all > works, I can run git pull and push commands without being asked for a > password. But if

[git-users] Re: git repository from windows to linux

2014-09-15 Thread Pierre-François CLEMENT
On Sunday, 14 September 2014 15:06:08 UTC+2, Robert Polanski wrote: > > Hi, > > I have changed system from windows to linux. > In project we use GIT. > The question is: can I move the project directory (containing source and > .git directory) to linux and still use without problems or I have to

Re: [git-users] git repository from windows to linux

2014-09-15 Thread Magnus Therning
On Sun, Sep 14, 2014 at 06:06:08AM -0700, Robert Polanski wrote: > Hi, > > I have changed system from windows to linux. > In project we use GIT. > The question is: can I move the project directory (containing source and > .git directory) to linux and still use without problems or I have to > es

Re: [git-users] Re: git checkout -t: better error

2014-09-15 Thread Konstantin Khomoutov
On Mon, 15 Sep 2014 07:41:58 -0700 (PDT) Pierre-François CLEMENT wrote: > > Could we improve the error message for `git checkout -t`? Sometimes > > I forget to type the remote name. Something like: > > > > "Missing remote or branch name; try -b" [...] > That said, here's the error I get > when ru

[git-users] Re: git checkout -t: better error

2014-09-15 Thread Pierre-François CLEMENT
On Friday, 12 September 2014 21:44:50 UTC+2, Andrew Pennebaker wrote: > > Could we improve the error message for `git checkout -t`? Sometimes I > forget to type the remote name. Something like: > > "Missing remote or branch name; try -b" > This group is for helping people with using Git; for chang

[git-users] Re: How can i write a script to push my commit in a live production site?

2014-09-15 Thread Pierre-François CLEMENT
On Friday, 12 September 2014 07:56:54 UTC+2, Bryan Bojorque wrote: > > I setup gitolite on my server, I can push commits to my bare and pull from > it. > > However when im done testing it on my dev page I want to try to push to to > live production server which is located in /var/www. > > How do

[git-users] Re: ssh keys

2014-09-15 Thread Pierre-François CLEMENT
On Tuesday, 9 September 2014 10:48:23 UTC+2, jo...@norricorp.f9.co.uk wrote: > > Hi, > I have run ssh-keygen to generate a rsa key which I pasted to the > authorized_keys file fore the git user on the git server. And all works, I > can run git pull and push commands without being asked for a pass

[git-users] git repository from windows to linux

2014-09-15 Thread Robert Polanski
Hi, I have changed system from windows to linux. In project we use GIT. The question is: can I move the project directory (containing source and .git directory) to linux and still use without problems or I have to essentially clone the project over again? -- You received this message because

[git-users] git checkout -t: better error

2014-09-15 Thread Andrew Pennebaker
Could we improve the error message for `git checkout -t`? Sometimes I forget to type the remote name. Something like: "Missing remote or branch name; try -b" -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this g

[git-users] How can i write a script to push my commit in a live production site?

2014-09-15 Thread Bryan Bojorque
I setup gitolite on my server, I can push commits to my bare and pull from it. However when im done testing it on my dev page I want to try to push to to live production server which is located in /var/www. How do I start writing that down? -- You received this message because you are subscr

[git-users] ssh keys

2014-09-15 Thread john
Hi, I have run ssh-keygen to generate a rsa key which I pasted to the authorized_keys file fore the git user on the git server. And all works, I can run git pull and push commands without being asked for a password. But if I run "ssh gituser@gitserver command" then I am asked for the password. s

Re: [git-users] Re: git merge --abort deleted my files!

2014-09-15 Thread Roman Neuhauser
# an...@webkr.de / 2014-09-15 03:13:06 -0700: > On Monday, September 15, 2014 4:22:39 AM UTC+2, Rick Umali wrote: > > The "git add ." should have created Git objects for these untracked files. > > When you did the "git merge --abort", you reset the working directory, > > deleting those files, but

[git-users] Re: git merge --abort deleted my files!

2014-09-15 Thread André Hänsel
On Monday, September 15, 2014 4:22:39 AM UTC+2, Rick Umali wrote: > > On Sunday, September 14, 2014 5:04:18 AM UTC-4, André Hänsel wrote: >> >> I ran git merge to merge a branch. There were some conflicted files. >> Although they were automatically resolved by git rerere, I still had to add >> th