[git-users] Re: Remote End Hung Up Error

2015-05-12 Thread Thomas Ferris Nicolaisen
On Monday, May 11, 2015 at 10:50:00 PM UTC+2, Stephen Scott wrote: Greetings; I am getting this error when trying to retrieve a repo from git. Has anyone seen this issue before, and if you have how did you resolve it. Cloning into 'x'... remote: Counting objects: 187683,

[git-users] Re: Trouble with the git-http-backend; Documentation unprecise

2015-05-12 Thread Matthias Lantsch
I'm sorry I forgot about the most important part: setting the pth variable for the PATH_INFO $pth = explode(GIT_DOCUMENT_ROOT, isset($_SERVER['REDIRECT_URL']) ? $_SERVER['REDIRECT_URL'] : '', 2); $pth = array_pop($pth); Am Dienstag, 12. Mai 2015 09:40:13 UTC+2 schrieb Matthias Lantsch:

[git-users] Re: Remote End Hung Up Error

2015-05-12 Thread Thomas Ferris Nicolaisen
On Monday, May 11, 2015 at 10:50:00 PM UTC+2, Stephen Scott wrote: Greetings; I am getting this error when trying to retrieve a repo from git. Has anyone seen this issue before, and if you have how did you resolve it. Please provide some information about your environment (both client

[git-users] Trouble with the git-http-backend; Documentation unprecise

2015-05-12 Thread Matthias Lantsch
*Hello Git Community,* I usually always try to solve problems myself, but I really have gotten onto my limits with this. Situation: I am trying to create a php glue script between apache and the git http backend in order to allow myself to hook into all git processes via my php framework (So

Re: [git-users] Help with git reset, please.

2015-05-12 Thread Dale R. Worley
Michael keybou...@gmail.com writes: keybounceMBP:config michael$ git commit -m First test [animalAging 0653a0b] First test 1 file changed, 140 insertions(+) create mode 100644 HarderWildlife.cfg keybounceMBP:config michael$ gitk --all ^C keybounceMBP:config michael$ git commit

[git-users] migrate history from svn to git on already created git repo

2015-05-12 Thread Yogesh Tyagi
Hi, Is it possible to migrate svn repo history to git when we have already created git repo. Can somebody please share the commands? Thanks, Yogesh -- You received this message because you are subscribed to the Google Groups Git for human beings group. To unsubscribe from this group and

[git-users] Rebase onto history from another repository

2015-05-12 Thread J66st
I have two repositories A and B. A is my working repository. B is a bare repository containing a more detailed history than A. This is illustrated in the following simplified graphs. *Repository A:* tagA] tagD] / / A1D1-E--F--G [master]

[git-users] Help with git reset, please.

2015-05-12 Thread Michael
I'm having trouble with git reset. It's not doing what I thought it would do. And, it seems to be throwing away data, which I thought git never did. Here's what I was doing. At the start, I had a test config file in the working directory and index. It is good enough, and the config file got an

Re: [git-users] Rebase onto history from another repository

2015-05-12 Thread J66st
Ah! Good to learn about git replace, thanks! I want to get rid of the old history so it would be fine to force git fetch B to override and replace existing local tags with the fetched tags of the same name. So what about the following plan, after setting A as a remote to B: git fetch B git

Re: [git-users] Rebase onto history from another repository

2015-05-12 Thread Konstantin Khomoutov
On Tue, 12 May 2015 04:39:32 -0700 (PDT) J66st vdplas.jo...@gmail.com wrote: I have two repositories A and B. A is my working repository. B is a bare repository containing a more detailed history than A. This is illustrated in the following simplified graphs. [...]

[git-users] Re: Trouble with the git-http-backend; Documentation unprecise

2015-05-12 Thread Thomas Ferris Nicolaisen
On Tuesday, May 12, 2015 at 9:40:13 AM UTC+2, Matthias Lantsch wrote: *Hello Git Community,* I usually always try to solve problems myself, but I really have gotten onto my limits with this. Situation: I am trying to create a php glue script between apache and the git http backend in

[git-users] Re: Rebase onto history from another repository

2015-05-12 Thread Thomas Ferris Nicolaisen
On Tuesday, May 12, 2015 at 1:39:32 PM UTC+2, J66st wrote: I have two repositories A and B. A is my working repository. B is a bare repository containing a more detailed history than A. This is illustrated in the following simplified graphs. *Repository A:* tagA] tagD] /

[git-users] Better way to merge two similar configuration blocks on different branches in the same file?

2015-05-12 Thread Andrew Leer
Hello all, I've posted the question in more detail here: http://stackoverflow.com/questions/30181228/better-way-to-git-merge-two-blocks-of-configuration-from-two-branches-in-the-sam Thank you, Andrew J. Leer -- You received this message because you are subscribed to the Google Groups

[git-users] Re: migrate history from svn to git on already created git repo

2015-05-12 Thread Thomas Ferris Nicolaisen
On Tuesday, May 12, 2015 at 12:30:22 PM UTC+2, Yogesh Tyagi wrote: Hi, Is it possible to migrate svn repo history to git when we have already created git repo. Can somebody please share the commands? I once demoed how to connect the history of a freshly converted repository from SVN with

Re: [git-users] Rebase onto history from another repository

2015-05-12 Thread J66st
To amend my last post: to preserve tags I found here http://stackoverflow.com/questions/5574566/how-do-i-preserve-tags-when-filtering-a-repository that I can add --tag-name-filter cat to preserve tags: git filter-branch --tag-name-filter cat -- --all -- You received this message because you