Hi, I'm working on a custom version of a GNU/Linux live distribution. I need to add/remove packages, edit scripts... I work in an unsquashed filesystem (squashfs-root/) used as root for chroot. I'm wondering which is the best way to manage my work. Should I create a git repo and add squashfs-root/? My main fear is messing up chroot env a...
Occasionally, when I do the following... git reset --hard HEAD is now at 0123abde comment is here git pull Updating 0123abde..456789fa I get the error... error: Entry 'filename' not uptodate. Cannot merge. The only workaround I have found is to 'git reset --hard', delete the offending file(s) then do 'git pull'. That doesn't seem ri...
To learn Doxygen, I created a branch and modified the source file comments of a slow-moving project. However, that project has since had large changes, splitting a large file into several smaller files: big_file.c -> big_file.c file_a.[ch] file_b.[ch] I want to do the same on my branch. Obviously, I can duplicate my branch's large_...
Hi, I got the following branches : master production and the following remotes branches : origin/master origin/production I got a script that fetches the origin/master branch and gets the diff of what changed from my last fetch (log -p master..origin/master). Then I merge origin/master. The commits found are pushed to a code ...
I have forked a branch from a repository it github and commit something for my using. now I found the original repository has a good feature which is at head, I want to merge it only without previous commits . what I should do? I have known how to merge all commit: git branch -b a-good-feature git pull repository master git checkout mas...
I intend to switch over from CVS to Git. In the case of SVN, there seems to be cvs2svn. Is there a similar tool to easily migrate from CVS to Git? ...
I'm working on a new project that I plan to keep in a git repository. I know how I would do this in CVS, but I'm a bit new to git and could use some suggestions. The project is firmware for two embedded devices that talk to each other and are packaged as a pair. For both devices there is a production variant and a manufacturing variant ...
I'm using msysgit for my embedded project. Local repositories are great, but I also like to have repositories on our network disk: it provides daily backup my changes are visible for everyone I have been trying to get the best of both worlds by doing the following: working on a repo on my local disk (faster building, always latest ...
I use GIT on a Mac. Enough said. I have the tools, I have the experience. And I want to continue to use it. No wars here... The problem is always with interoperability. Most people use SVN, which is great for me. Git SVN works out of the box, and is a no frills solution. People can continue happily use SVN and I don't loose my workflow ...
Situation: I have a local copy of a website I have a server that I have SSH access to What do I want to do? Commit locally until I'm happy with my code Make branches locally Have one master branch that is the one that should be pushed to the server Update the website using a single command (git push origin master) If I set up a g...
I noticed that if I do something like: script/plugin install git://github.com/plug-xyz.git It says it is creating a .git folder: Initialized empty Git repository in /Users/g/Documents/app/vendor/plugins/xyz/.git/ But after the plugin is installed, it seems that the .git folder is gone. I ask because when I try to update the plugin...
Hi, Can someone tell me what the hype is over Git and Mercurial over Subversion? ...
Basic question about the way git works. I clone a repo, make some changes, commit and push the changes back to the original repo. When I do a git log, the commit message shows up, but the actual files aren't in the directory. Should they be there? ...
I have the file "main.cpp" open in my editor. I want to see the previous revision of "main.cpp" in the editor too. The way I do it now is like this. close "main.cpp" in the editor prompt> mv main.cpp tmp prompt> git checkout HEAD^ main.cpp prompt> mv main.cpp old_main.cpp prompt> mv tmp main.cpp prompt> open "main.cpp" and "old_main...
I have 5-10 independent projects that I want place under version control using Git. What is the best way to organize the projects/respositories: Use one repository for each project use one repository for all my work and use subdirectories for each project Or something completely different What has worked best for you and why? ...
I have a git repo, and a revision code I want it to get my local clone to. How can I bring it up to a specific revision and get rid of any changes I've made? ...
I have two related repositories, a master, which contains a number of sensitive files which must not be leaked, and a 'public' version, created with hg convert with --filemap to exclude the sensitive files and directories. I would like further updates to the master that don't affect the sensitive files to be pushable to the slave, and u...
I put the following code to my .gitconfig unsuccessfully . /Users/Masi/bin/personal I get the following error fatal: bad config file line 7 in /Users/Masi/.gitconfig How can you source an external file in .gitconfig? ...
Sorry in advance if this not 'SO'-ish enough--- I have a tech writing friend who is looking into version control for her word and visio documents. I advised her to check out TortioseSVN or whatever M$-flavor of Git is out there for local version control. However, she is concerned about what will happen if a file gets corrupted...I obv...
Would you switch a SVN hosted C# project (2-5 developers) to GIT? Does it have any advantages that make it worth the extra effort? I doubt it, but look for arguments for both sides. ...