[git-users] Re: git pull failed.

2019-10-03 Thread Philip Oakley
So, you need to be on a branch. That is because 'pull' is a fetch, then a merge into the current branch. You could read about 'remote tracking branches' and use just 'fetch', Or you could start by checking out (or creating) your new current (e.g. master) branch. You did not say how you got

[git-users] Re: Git pull/checkout streaming API/CLI

2019-09-08 Thread fru xo
Hi again :) Thanks for all the feedback, really appreciate it! If when you say “run git locally” you mean perform the actual checkout by running the usual commands, that is what I’m currently doing just to unlock myself, but being this part of an API server and being the purpose to store the

[git-users] Re: Git pull/checkout streaming API/CLI

2019-09-08 Thread Philip Oakley
Hi F, Yes, the https://git-scm.com/book/en/v2/Git-Internals-Transfer-Protocols are the ones that could be considered as an API. Though it maybe worth simply running Git locally so that you don't need to write any code..just a few scripts. Other options are looking at Git Bundle, which is

[git-users] Re: Git pull/checkout streaming API/CLI

2019-09-08 Thread fru xo
Hi Phillip, thanks for the pointers. I did not know about fast-import/export, I’ll have a look as streaming is what I need :) As far as pack streams, is this what you refer to https://git-scm.com/book/en/v2/Git-Internals-Transfer-Protocols ? I’ve read it this morning, not sure yet if it’ll do

[git-users] Re: Git pull/checkout streaming API/CLI

2019-09-08 Thread Philip Oakley
On Sunday, September 8, 2019 at 9:55:23 AM UTC+1, fru xo wrote: > > Hi all, > I’d love to be able to issue a git pull/checkout and stream its results to > an on-line cloud storage for another party there to actually downloading it > and working with the source. > Roughly just pipe all from a

Re: [git-users] Re: git pull/merge without committing local changes

2015-09-22 Thread Machiel Kolstein
Thank you very much! Cheers, Machiel On Monday, September 21, 2015 at 7:22:39 PM UTC+2, Konstantin Khomoutov wrote: > > On Fri, 18 Sep 2015 01:46:14 -0700 (PDT) > Machiel Kolstein wrote: > > [...] > > Just after reading it for the first time, I see that there is not >

Re: [git-users] Re: git pull/merge without committing local changes

2015-09-21 Thread Konstantin Khomoutov
On Fri, 18 Sep 2015 01:46:14 -0700 (PDT) Machiel Kolstein wrote: [...] > Just after reading it for the first time, I see that there is not > only one, but two very well explained answers to my question (I am > not sure yet which one I will chose, because it will take some time

[git-users] Re: git pull/merge without committing local changes

2015-09-18 Thread Machiel Kolstein
Hi Konstantin, Let me first of all say: wow! Many thanks for that more than complete explanation. Again: wow! Just after reading it for the first time, I see that there is not only one, but two very well explained answers to my question (I am not sure yet which one I will chose, because it

[git-users] Re: git pull-push ?

2014-06-26 Thread Pierre-François CLEMENT
Le mercredi 25 juin 2014 13:15:23 UTC+2, Konstantin Khomoutov a écrit : The imaginary `git pull-push` has no sense as `git pull` might legitimately result in a merge conflict. Note that `git pull` is a sort of macro for `git fetch` + `git merge` which just makes certain (rather strong)

Re: [git-users] Re: git pull-push ?

2014-06-26 Thread Konstantin Khomoutov
On Thu, 26 Jun 2014 01:44:34 -0700 (PDT) Pierre-François CLEMENT lik...@gmail.com wrote: The imaginary `git pull-push` has no sense as `git pull` might legitimately result in a merge conflict. Note that `git pull` is a sort of macro for `git fetch` + `git merge` which just makes

Re: [git-users] Re: git pull-push ?

2014-06-26 Thread Pierre-François CLEMENT
Le jeudi 26 juin 2014 13:04:18 UTC+2, Konstantin Khomoutov a écrit : On Thu, 26 Jun 2014 01:44:34 -0700 (PDT) Pierre-François CLEMENT lik...@gmail.com javascript: wrote: The imaginary `git pull-push` has no sense as `git pull` might legitimately result in a merge conflict. Note that

Re: [git-users] Re: git pull-push ?

2014-06-26 Thread Konstantin Khomoutov
On Thu, 26 Jun 2014 04:42:38 -0700 (PDT) Pierre-François CLEMENT lik...@gmail.com wrote: [...] What I do not understand however, is what made you think *treaki* needed these explanations in the first place? Don't get me wrong, it's no big deal; but I could have asked the same question, and I

[git-users] Re: git pull-push ?

2014-06-25 Thread Thomas Ferris Nicolaisen
On Wednesday, June 25, 2014 9:26:50 AM UTC+2, treaki wrote: Hi, i am using git with an ssh remote running at my router@home. the most times i use it the following way: git pull git push the problem i see it that he ueses 2 ssh sessions for this job, so i would like to ask if there is

[git-users] Re: git pull username password prompt

2013-01-15 Thread Philipp Kraus
Am Sonntag, 13. Januar 2013 13:32:10 UTC+1 schrieb Thomas Ferris Nicolaisen: Could it be that Apache (or whatever webserver you use) is not correctly configured? Please post the details of your environment along with the Apache configuration. I don't think so, I have used the

[git-users] Re: git pull username password prompt

2013-01-13 Thread Thomas Ferris Nicolaisen
On Saturday, January 12, 2013 2:20:33 AM UTC+1, Philipp Kraus wrote: Hello, I'm using HTTPS (smart-http) for push/pull data to a Git repo. On push the Git client prompts for username and password, after inserting the data will be send. On pulling I must set the origin URL to

Re: [git-users] Re: git pull asks for commit comment

2012-06-20 Thread Konstantin Khomoutov
On Tue, 19 Jun 2012 12:02:26 -0700 (PDT) Dan Hirsmuller-Counts xpemda...@gmail.com wrote: This is one of the recent changes in Git to make it more user friendly. More specifically in this point, help users avoid these automatic merge messages that can sometime be a bit ugly. From

[git-users] Re: git pull asks for commit comment

2012-05-22 Thread Thomas Ferris Nicolaisen
Hi Thorsten, This is one of the recent changes in Git to make it more user friendly. More specifically in this point, help users avoid these automatic merge messages that can sometime be a bit ugly. From http://git-scm.com/docs/git-pull : --no-edit Invoke an editor before committing

[git-users] Re: git pull asks for commit comment

2012-05-22 Thread Thorsten Peters
Thx :-) Am Dienstag, 22. Mai 2012 11:09:33 UTC+2 schrieb Thomas Ferris Nicolaisen: Hi Thorsten, This is one of the recent changes in Git to make it more user friendly. More specifically in this point, help users avoid these automatic merge messages that can sometime be a bit ugly. From

[git-users] Re: git pull whithout download all file

2011-03-31 Thread Jeenu
On Mar 30, 7:13 pm, vercetty92 vin...@gmail.com wrote: Hello everybody, I search a way for retrieve a single file on a git client (solaris). My goal is to not download all the repository from the server. so the first time i do a|git clone -n and after if I want to download a single file

[git-users] Re: git pull whithout download all file

2011-03-30 Thread Thomas Ferris Nicolaisen
I think the easiest way would be to run instaweb in the git repository, and then get the file you want via http/wget. More info here: https://git.wiki.kernel.org/index.php/Gitweb -- You received this message because you are subscribed to the Google Groups Git for human beings group. To post

[git-users] Re: git pull error

2010-10-07 Thread Konstantin Khomoutov
On Oct 7, 11:05 am, Chandu80 chandu.she...@gmail.com wrote: I fetched a remote repository(git fetch) and pulled(git pull) the contents from it successfully. Now I change a file in the working directory,stage it(git add) and commit(git commit) it  and then  push(git push) it back to the remote