Re: [git-users] merge two repos?

2014-02-27 Thread Ed Pataky
again in other words, i want main to now contain all changes from A and B and i want to use only main from now on On Wednesday, February 26, 2014, Ed Pataky ed.pat...@gmail.com wrote: the purpose for me is, i no longer want to commit in A or B only Main but i want the old history to survive

Re: [git-users] merge two repos?

2014-02-27 Thread Thomas Ferris Nicolaisen
On Thursday, February 27, 2014 8:59:57 AM UTC+1, HWSWMAN wrote: again in other words, i want main to now contain all changes from A and B and i want to use only main from now on If you do it the way I described, MAIN will have full copies of the contents and histories of A and B. You

[git-users] Re: Unable to install Git after building _everything_

2014-02-27 Thread Ricky Seltzer
I had the same problem installing git vesion 1.9.0 from sources on my Ubuntu 13.10 system. I fixed it based on Toby's suggestion, but for Ubuntu: *sudo apt-get install docbook2X* Then I just re-ran the make line and it continued from where it had stopped. Ricky -- You received this message

[git-users] Use GIT for MS Office and LibreOffice files

2014-02-27 Thread Joao Emanuel Simonini
* Sorry for horrible english, is not my native language. I like to know if can possible use GIT for works with MS Office and LibreOffice files? Can merge files or only can make a repository? -- You received this message because you are subscribed to the Google Groups Git for human beings

Re: [git-users] Use GIT for MS Office and LibreOffice files

2014-02-27 Thread John McKown
git can be used for any type of file. Even binary files such as compiled programs and MS Office .doc .docx files. It is not restricted to text only. Now, some of the functions in git might not work well with a binary type file. As an example, something like git diff won't tell you the changes you

Re: [git-users] Use GIT for MS Office and LibreOffice files

2014-02-27 Thread Joao Emanuel
Hi, i understand thanks for your help. 2014-02-27 9:10 GMT-04:00 John McKown john.archie.mck...@gmail.com: git can be used for any type of file. Even binary files such as compiled programs and MS Office .doc .docx files. It is not restricted to text only. Now, some of the functions in git

Re: [git-users] Use GIT for MS Office and LibreOffice files

2014-02-27 Thread Konstantin Khomoutov
On Thu, 27 Feb 2014 04:59:38 -0800 (PST) Joao Emanuel Simonini joaoemanuel1...@gmail.com wrote: * Sorry for horrible english, is not my native language. I like to know if can possible use GIT for works with MS Office and LibreOffice files? Can merge files or only can make a repository? If

[git-users] git svn install

2014-02-27 Thread Fabio D'Alfonso
Hi, I was setting up git 1.9.0 and came back a question. I see the Perl lib built during the make (if I am not wrong), but I got the git svn setup working, last time, using the svn package, using make swig-pl So is there a way to install from git after the build? Thanks Fabio D'Alfonso --

Re: [git-users] How to setup http protocol for GIT

2014-02-27 Thread Jirong Hu
I setup smart http following this URL: http://www.parallelsymmetry.com/howto/git.jsp When I try to push from a Window client to the GIT Linux server, I got this error: error: insufficient permission for adding an object to repository database ./objectse The question is how shall I setup the

[git-users] git merge issue

2014-02-27 Thread praveenm mulimani
Dear All, We have created git repository A.git installed gerrit 2.8.1. based on the chipset_vendor i pushed the source to A.git repository *Master_Branch.* Developer pushed changes to A.git *Master_Branch* Now chipset_venodor has given the latest source we have to merge with our