Re: [git-users] merge two repos?
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 for those ... it looks like if i do this, A and B will still be indepwndant repos, which is ok, but say i make anchange to A or B , will i see the change in main and can i commit it to main, or i still have to commit to A and B? and, if i can commit to main, then a month down the road, does it mean i will have tons of uncommited changes in A and B? in other words, i want to keep the history of A and B but i want A and B to stop tracking changes and only main tracks changes ... does that make sense, is it possible? On Wednesday, February 26, 2014, Thomas Ferris Nicolaisen tfn...@gmail.com javascript:_e(%7B%7D,'cvml','tfn...@gmail.com'); wrote: On Thursday, February 27, 2014 8:12:26 AM UTC+1, HWSWMAN wrote: I have a directory ./MAIN/ with /A/ and /B/ under MAIN ./MAIN/ ./MAIN/A/ ./MAIN/B/ A and B have their own repos ... i want to combine them so i have a repo under MAIN, while keeping the history of A and B ... how can i do this? i use sourcetree if any specific help using sourcetree is possible .. otherwise i am somewhat comfortable using command line git then opening that in sourcetree later .. any help is appreciated This sounds like a job for git subtree. Here's an extended article on it: http://blogs.atlassian.com/2013/05/alternatives-to-git-submodule-git-subtree/ So, first you want to move A and B out of the way: cd MAIN mv A .. mv B .. Now initialize MAIN into being a git repository: git init Now, add A and B as subtrees: git subtree add --prefix A ../A master git subtree add --prefix B ../B master Job done! Note that if you don't have the git subtree command in your Git installation, see the above mentioned blogpost for instructions on how to get it working. -- You received this message because you are subscribed to a topic in the Google Groups Git for human beings group. To unsubscribe from this topic, visit https://groups.google.com/d/topic/git-users/Pjl10BI4OtI/unsubscribe. To unsubscribe from this group and all its topics, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out. -- You received this message because you are subscribed to the Google Groups Git for human beings group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
Re: [git-users] merge two repos?
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 can in essence delete them (or put them in another place for safe-keeping, recommended). -- You received this message because you are subscribed to the Google Groups Git for human beings group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
[git-users] Re: Unable to install Git after building _everything_
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 because you are subscribed to the Google Groups Git for human beings group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
[git-users] Use GIT for MS Office and LibreOffice files
* 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 group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
Re: [git-users] Use GIT for MS Office and LibreOffice files
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 made in an Office .doc file in any form that is useful. But you certainly can do a git add of a binary format file. And you can do a git checkout ... to restore an old version of a binary format file. Those are just two examples that I can think of which might be useful. On Thu, Feb 27, 2014 at 6:59 AM, 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? -- You received this message because you are subscribed to the Google Groups Git for human beings group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out. -- Wasn't there something about a PASCAL programmer knowing the value of everything and the Wirth of nothing? Maranatha! John McKown -- You received this message because you are subscribed to the Google Groups Git for human beings group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
Re: [git-users] Use GIT for MS Office and LibreOffice files
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 might not work well with a binary
type file. As an example, something like git diff won't tell you the
changes you made in an Office .doc file in any form that is useful. But
you certainly can do a git add of a binary format file. And you can do a
git checkout ... to restore an old version of a binary format file. Those
are just two examples that I can think of which might be useful.
On Thu, Feb 27, 2014 at 6:59 AM, 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?
--
You received this message because you are subscribed to the Google Groups
Git for human beings group.
To unsubscribe from this group and stop receiving emails from it, send an
email to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.
--
Wasn't there something about a PASCAL programmer knowing the value of
everything and the Wirth of nothing?
Maranatha!
John McKown
--
You received this message because you are subscribed to a topic in the
Google Groups Git for human beings group.
To unsubscribe from this topic, visit
https://groups.google.com/d/topic/git-users/yFmg7DR1sjo/unsubscribe.
To unsubscribe from this group and all its topics, send an email to
git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.
--
Muito obrigado antecipadamente pela atenção prestada a esta mensagem.
--
{}s
Joao Emanuel
--
You received this message because you are subscribed to the Google Groups Git
for human beings group.
To unsubscribe from this group and stop receiving emails from it, send an email
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.
Re: [git-users] Use GIT for MS Office and LibreOffice files
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 by can merge files you mean be able to reconcile conflicts in MSO and LibO files then the answer is no. At least not easily: Git only includes machinery to deal with conflicting changes in textual files (using 7- or 8-byte encodings) and MSO and LibO files are binary (they are zip archives). This means, without extra effort, in case a conflict occurs, you'll only be able to pick one side of it and take it as winning the conflict. On the other hand, both software packages provide their own versioning support for the documents they manage: https://help.libreoffice.org/Common/Compare_Document http://office.microsoft.com/en-001/word-help/compare-and-merge-documents-HP005188939.aspx so you could possibly adopt a policy of always recording versions of the documents, and should a conflict occur, resolve it using the MSO and LibO themselves and then deem the resulting file as having the changes reconciled. -- You received this message because you are subscribed to the Google Groups Git for human beings group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
[git-users] git svn install
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 -- You received this message because you are subscribed to the Google Groups Git for human beings group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
Re: [git-users] How to setup http protocol for GIT
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 permission for the repository at:
/opt/git/simple.git. My users are in domain group ccusers, and the web
server is running under a local user apache:apache by default. I want to
be able to access the repository by both ssh (for developers) and http (for
build).
Thanks
Jirong
On Tuesday, 25 February 2014 08:16:11 UTC-5, Konstantin Khomoutov wrote:
On Mon, 24 Feb 2014 12:52:05 -0800 (PST)
Jirong Hu jiro...@gmail.com javascript: wrote:
http://git-scm.com/book/en/Git-on-the-Server-Public-Access
I was following the above link to setup http access for GIT. But
after this
issue:https://groups.google.com/forum/#!topic/git-users/nL0qZXiBHqw,
I think my http settings are not right. This is what I do:
1. Change the DocumentRoot= /opt/git, since /opt/git/simple.git is
the repository I want to access.
2. Created a git.conf in /etc/httpd/conf.d, has the LDAP access
information. It works fine.
3. chmod a+x simple.git/hooks/post-update
1. 'x' alone is not enough to execute a program--'r' is needed as well.
2. Granting execute permission to all ('a') is not needed if the
user or a group of users which are about to execute that hook
are already granted these permissions explicitly.
There is one more thing I am not sure: the permission of
/opt/git/simple.git. Who shall own this directory? The URL above says
www-data, but I cant' find this group name in my server. My Apache
is running under apache:apache.
www-data is a Debianism, found on Debian and its derivatives (Ubuntu
included); since Ubuntu is the winning distro even on servers these
days, many guides found in the internets just assume this common
ground. So substitute system user for the Apache web server instead
of www-data and proceed.
[...]
drwxrwsr-x 7 root ccusers 4096 Feb 21 14:22 simple.git
[...]
Well, the guide from The Book you followed is unfortunately outdated:
it deals with the so-called dumb HTTP transport which still works in
newer versions of Git but is not recommended for using as it's *slow:*
it basically crawls over the objects and packfiles it literally fetches
one by one using HTTP calls. For this setup, your settings look mostly
okay. One caveat though: the purpose of the post-update hook is to
call a special Git command which prepares the repo *updated with the
last commit* to be fetched from using that dumb HTTP transport. So if
you didn't run that hook (either by hand (note that you should `su` to
the Git's user first!) or by pushing to that repo using SSH) your
client Git won't fetch anything useful.
Hence I'd say the real way to fix this is to set your web server up to
serve the newer smart HTTP transport which basically uses the web
server to host a CGI Git process which, when started, communicates
directly with the Git client process making the whole thing work as fast
as fetching via native Git protocol (git://, served by `git-daemon`).
This guide [1] explains how to set things up.
1. https://www.kernel.org/pub/software/scm/git/docs/git-http-backend.html
--
You received this message because you are subscribed to the Google Groups Git
for human beings group.
To unsubscribe from this group and stop receiving emails from it, send an email
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.
[git-users] git merge issue
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 Master_Branch , we created the new branch pushed the latest chipset source code to new branch (*Chipset_Master*) created the tag -- Chipset_Tag. We have downloaded the Master_Branch did the merge with Chipset_Tag observed that git is not performing auto merge , we compared the files not line conflict , white space also but unable to auto_merge Quick response is very much appreciated. Regards, Praveen -- You received this message because you are subscribed to the Google Groups Git for human beings group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
