Two uses of version control seem to dictate different checkin styles. distribution centric: changesets will generally reflect a complete feature. In general these checkins will be larger. This style is more user/maintainer friendly. rollback centric: changesets will be individual small steps so the history can function like an incred...
Using Mercurial (hg), can you just "hg backout" all the commits you did for the files you don't want to push, and then do a push? Because Mercurial (or Git) won't let us push a single file or a single folder to another repository, so I am thinking: 1) How about, we just look at the commit we did, and hg backout the ones we don't want t...
My boss has a Perforce repository for which he wants to make a read-only copy available on Sourceforge via subversion. He had a perl script which would do this but it's no longer functioning (we don't want to try debugging it yet) and it's really not that great anyway. So an alternate solution is to pull the perforce repo into git as a ...
I want change author at one specific commit in history. It's not last commit. I know about this question - How do I change the author of a commit in git? But I thinking about something, where I identify commit by hash or short-hash. ...
Hi, I'm getting this git error and I don't really get what it means, nor how I can fix it: (v_env)[nubela@nubela-desktop searchplus]$ git pull origin master From file:///home/nubela/Workspace/_git/searchplus * branch master -> FETCH_HEAD Updating 38f3d5b..fe6028c error: Untracked working tree file 'searchplus/.project' w...
I am new to Git. I have created a master repository in a linux server. The same server is going to be used by 5 groups of 3 users each. I want to create one local repository for each group. And the group members in turn should create one local repository for each of them, play with the contents and committ the modificatons to the group's...
In short: Is there a way to disable storing full history for specific folders in git-svn repo? We have pretty large SVN repo with big checkout. I would like to migrate it to Git for my local development, because Git speeds up update and status commands orders of magnitude. When I simply do git svn clone it creates very big repo. Big en...
Let's say I have a file named a.txt. I add it to the staging area, and then I modify it. How could I return it to the way it was when I added it? ...
That is, I don't want to actually delete the branch in the remote repository, but I don't want the branch locally anymore. Can I just do git branch -d the_branch and it won't get propagated when I later git push ? Will it only propagate if I were to run git push origin :the_branch later on? ...
Is there a quick-start guide to using Git Extensions for basic tasks such as checkout, checkin, undo-checkout, etc, especially for users coming from the Microsoft world? ...
I'd like to move my project to GitHub from local svn repository. Multiple developers are curently working on this project. I was thinking that each developer should have their own branch in which they would commit changes. When manager review their work, he will merge it into master branch. I don't want separate repository for each devel...
When doing a git rebase, I often have difficulty working out what is happening with the 'local' and 'remote' when resolving conflicts. I sometimes have the impression that they swap sides from one commit to the next. This is probably (definitely) because I still haven't properly understood. When rebasing, who is 'local' and who is 'rem...
I'm completely new to Linux, but today I find myself setting up a server (Ubuntu 10.04 LTS lucid) from scratch to host a Rails application. Anyway, I managed to get a Rails app up and running on the server itself, but I had to scrap that because I want to use Git. So I setup a git repository on the server, then pushed all the code from ...
Possible Duplicate: How to do a git export (like svn export) I'm looking for a single command that effectively does the following: git clone git://github.com/rails/rails.git --depth=1 rm -rf rails/.git Is there a command that does this? ...
I have multiple active branches that I need to work on at the same time. Clearly I can create two working directories with a distinct branch per directory. Is that the only way to do it without having to "commit" and "checkout" in order to switch from one branch to another? ...
My project is six months old and git is very very slow. We track around 30 files which are of size 5 MB to 50 MB. Those are binary files and we keep them in git. I believe those files are making git slow. Is there a way to kill all files of size > 5MB from the repository. I know I would lose all of these files and that is okay with me. ...
I am using git to track content which is changed by some people and shared "read-only" with others. The "readers" may from time to time need to make a change, but mostly they will not. I want to allow for the git "writers" to rebase pushed branches** if need be, and ensure that the "readers" never accidentally get a merge. That's norm...
I'm looking for tips on how to seamlessly integrate subversion and git, for deploying web sites by a small team of web developers. We each have our own development versions of our sites on our local machines. We also have dev, staging, and live servers. As our team has grown, we haven't updated our revision control and deployment strate...
Here is what I have - a git repo of my code: projects |-proj1 (no git repo here yet) |-subproj1 <- current git repo here Here is what I want - a git repo which is now tracking a new project that uses my code: projects |-proj1 <-git repo moved to here, but still tracking files in subproj1 |-subp...
My question is: can i have 2 repositories without losing my original repository. Lets say i want the the eclair source repository repo init -u git://android.git.kernel.org/platform/manifest.git -b eclair (already synced and working) and i would also like to sync with cyanogens repository repo init -u git://github.com...