[git-users] git push

2013-01-07 Thread k-joseph
Hi every one, am kindly requesting for your assistance, i successfully push to a remote branch on my account for the first time( first push where i use git push origin ) but when am pushing the second or any other time except the first i normally get an error $ git push Enter passphrase fo

[git-users] Issue in checking out repo in GIT in eclipse

2013-01-07 Thread gaugeta
Hello Guys, ** I have a git repo in my Ubuntu server set up. I want to checkout that repo on my windows machine into eclipse. I have installed EGIT plugin my eclipse. I tried checking importing the files from using the plugin by choosing the URI option in eclipse and got an Unknown Ho

Re: [git-users] Re: Problem with moving everything into a subdirectory; merge conflicts

2013-01-07 Thread Philip Oakley
From: "Carsten Fuchs" Sent: Monday, January 07, 2013 9:21 AM Hi Philip, Am 2013-01-06 18:21, schrieb Philip Oakley: Your issue [my mistake] is that the (gits's) merge process is a three way merge, so you have the two commits F and N to merge, but git will also locate the merge-base at M (whic

Re: [git-users] File diff shows up as single line

2013-01-07 Thread Aaron Woehler
Fixed the problem with CFBuilder using the File->Convert Line Delimiters to (Windows format). Thanks, Aaron On Wednesday, December 26, 2012 3:06:16 PM UTC-9, Dale Worley wrote: > > > From: Aaron Woehler > > > > > I have two files in my repository that started showing up as single > lines. >

Re: [git-users] Asyncronous post-receive

2013-01-07 Thread Konstantin Khomoutov
On Mon, Jan 07, 2013 at 02:42:46AM -0800, kumar wrote: > Is it possible to have asynchronous post-receive. I want to run a mirror > script which will send a push request to the mirror server. Currently when > i do a push to the remote server I have to wait for it push to the mirror > server als

[git-users] Asyncronous post-receive

2013-01-07 Thread kumar
Hi Is it possible to have asynchronous post-receive. I want to run a mirror script which will send a push request to the mirror server. Currently when i do a push to the remote server I have to wait for it push to the mirror server also. Is there a way for post-receive script asynchronously fro

[git-users] Re: Problem with moving everything into a subdirectory; merge conflicts

2013-01-07 Thread Carsten Fuchs
Hi Philip, Am 2013-01-06 18:21, schrieb Philip Oakley: Your issue [my mistake] is that the (gits's) merge process is a three way merge, so you have the two commits F and N to merge, but git will also locate the merge-base at M (which has the old directory structure), and compares the diffs b