[git-users] What mechanisms for code comparison and merge between versions on git are used?
Hi, I was interested on learning more about the mechanisms used on git to verify if a certain code has been modified or not and how the merge function works. Is there any non-code documentation available for this? I would also be interested on knowing if git employs any abstract syntax tree comparisons during this comparison between versions and merging (or maybe anywhere else) for any of its usage. Thank you in advance, Carlos -- You received this message because you are subscribed to the Google Groups Git for human beings group. To view this discussion on the web visit https://groups.google.com/d/msg/git-users/-/UDdwMc9Cq7EJ. To post to this group, send email to git-users@googlegroups.com. To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.
[git-users] excludesfile on Windows
Good day! I need excludesfile for a specific branch. $ git config --local branch.master.excludesfile +info/exclude_public $ ls .git/info/ exclude exclude_public refs $ cat .git/info/exclude_public TODO.txt $ git status # On branch master # Untracked files: # (use git add file... to include in what will be committed) # # .gitignore *# TODO.txt* nothing added to commit but untracked files present (use git add to track) Does excludesfile work properly on Windows 7? What am I doing wrong? Regards, Alex -- You received this message because you are subscribed to the Google Groups Git for human beings group. To view this discussion on the web visit https://groups.google.com/d/msg/git-users/-/FQhtosxHY-4J. To post to this group, send email to git-users@googlegroups.com. To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.
[git-users] Re: excludesfile on Windows
Hi, Just checking here, are you aware of the normal way of excluding files with .gitignore files? I see you have one there in your working directory but maybe you haven't made use of it yet. The .git/info/excludes is more for the case where *you* want to ignore something, but don't want to share this configurations with others cloning the repository. The nice thing with .gitignore files is that they can be checked into specific branches, thereby avoiding your problems. Try this: git checkout master echo TODO.txt .gitignore git add .gitignore git commit -m Ignoring TODO text files I don't believe they work differently on Windows 7, but if you still can't get it working, I can fire up Windows here and figure it out. If you still want to do it using the excludes file, there's a writeup on how to do it here: http://cogniton-mind.tumblr.com/post/1423976659/howto-gitignore-for-different-branches And the official docs on: http://git-scm.com/docs/gitignore On Sunday, June 10, 2012 2:52:14 PM UTC+2, Alexander Myltsev wrote: Good day! I need excludesfile for a specific branch. $ git config --local branch.master.excludesfile +info/exclude_public $ ls .git/info/ exclude exclude_public refs $ cat .git/info/exclude_public TODO.txt $ git status # On branch master # Untracked files: # (use git add file... to include in what will be committed) # # .gitignore *# TODO.txt* nothing added to commit but untracked files present (use git add to track) Does excludesfile work properly on Windows 7? What am I doing wrong? Regards, Alex -- You received this message because you are subscribed to the Google Groups Git for human beings group. To view this discussion on the web visit https://groups.google.com/d/msg/git-users/-/Ogg_ep1IDu8J. To post to this group, send email to git-users@googlegroups.com. To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.
[git-users] Re: What mechanisms for code comparison and merge between versions on git are used?
Hi Carlos, You should be able to find some more hints on how merging works here: http://git-scm.com/docs/git-merge I also find the Git book explains the basics pretty well here: http://git-scm.com/book/en/Getting-Started-Git-Basics And more in detail here: http://git-scm.com/book/en/Git-Internals -- You received this message because you are subscribed to the Google Groups Git for human beings group. To view this discussion on the web visit https://groups.google.com/d/msg/git-users/-/FwjJemxg4jQJ. To post to this group, send email to git-users@googlegroups.com. To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.
[git-users] Migrate Clearcase data to GIT
Hi, My organization is currently using IBM Clearcase for version control. We have now decided to switch to GIT. Is it possible to migrate all the exisiting data in clearcase to GIT. If yes please help to provide the steps. Thanks -- You received this message because you are subscribed to the Google Groups Git for human beings group. To view this discussion on the web visit https://groups.google.com/d/msg/git-users/-/rW-jKKZNeScJ. To post to this group, send email to git-users@googlegroups.com. To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.
Re: [git-users] Re: What mechanisms for code comparison and merge between versions on git are used?
Thank you Thomas, I will look into this! Carlos Andrade http://carlosandrade.co 2012/6/10 Thomas Ferris Nicolaisen tfn...@gmail.com Hi Carlos, You should be able to find some more hints on how merging works here: http://git-scm.com/docs/git-merge I also find the Git book explains the basics pretty well here: http://git-scm.com/book/en/Getting-Started-Git-Basics And more in detail here: http://git-scm.com/book/en/Git-Internals -- You received this message because you are subscribed to the Google Groups Git for human beings group. To view this discussion on the web visit https://groups.google.com/d/msg/git-users/-/FwjJemxg4jQJ. To post to this group, send email to git-users@googlegroups.com. To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/git-users?hl=en. -- You received this message because you are subscribed to the Google Groups Git for human beings group. To post to this group, send email to git-users@googlegroups.com. To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.
[git-users] Official mailing list e-mail for questions and comments doesn't work
I've been trying to send an e-mail to g...@vger.kernel.org, but I keep getting Delivery to the following recipient failed permanently errors. Here's the message: Hi, This page does not appear to be working any longer: https://git.wiki.kernel.org/articles/g/i/t/GitSvnCrashCourse_512d.html The maintainer of this page pa...@suse.cz, also has a broken e-mail. -- You received this message because you are subscribed to the Google Groups Git for human beings group. To view this discussion on the web visit https://groups.google.com/d/msg/git-users/-/CfYE8jHQ_vYJ. To post to this group, send email to git-users@googlegroups.com. To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.