Hi, we use SVN for our work. We are a small webdesigner studio and we write in PHP developing some kind of "framework" meantime. Now we are thinking about some more powerful solution and we would like to try git-svn. We use branches as different projects - one branch, one project. So I have in my computer exactly the same structure in m...
I got very used to git's way of having to touch every file you want to commit, and, while at it, double-check the diff. Now at work i have to use svn and i keep commiting stuff accidentially. Is there a way to make subversion behave like git in that i have to tell every file explicitly that should be included in the next commit? ...
Hi, Anyone know of good articles for setting up a new project with git and asp.net mvc? Just wondering what to include and ignore and what to do about deployment. Cheers Trev ...
When doing: >git status It shows a big list of .pyc files under "untracked files". I don't want it to show these, as it adds noise. In other words, how do I make git ignore .pyc files all the time and for all projects? EDIT I'm not asking for a way to spread my ignored files to other people, I really just mean "for all projects", ...
I made a change in a script and committed it. Then I made a few other changes, and pushed them to a remote repository and such. Then I realised that first change I mentioned was stupid, and want to undo it.. Can I "unapply" that commit, without manually copy/pasting the diff? As an example: I have two files, a.py and b.py: Commit 1: I...
I want to work on some Android code together with others and need to set up repository to be used locally within the team. However, it seems like repo doesn't let me do that. And neither does cloning a git repository in the android repo like this: $ git clone /var/android/.repo/projects/bionic.git/ I get the following error message: ...
I'm using a Git repository for everything related to a website I'm developing. The repository holds all files related to the site, including documentation, mockups, original layered images, etc. as well as the web root stuff that I've put in a www subdirectory. I'm at the point where I want to start integrating the CMS I've chosen to us...
I have a site running on django, (but the question applies to anything, php, etc) Currently I'm using unison to deploy my changes, and I (kinda used to) love it because before that I was doing it manually!! Now, as I'm getting my feet wet with git, I'm starting to love it! And I'm thinking if maybe I should use it instead of unison to ...
Is there a buildbot plugin that will poll a git repository for new commits, like the currently included changes.SVNPoller? The closest I have found is git_buildbot.py, but it works as a post-commit hook, so will not work with my setup (using Github, and buildbot on a machine that github's post-commit cannot reach) - simply polling the g...
I've asked before about how to squash the first two commits in a git repository. While the solutions are rather interesting and not really as mind-warping as some other things in git, they're still a bit of the proverbial bag of hurt if you need to repeat the procedure many times along the development of your project. So, I'd rather g...
Hello! I'm researching the idea of building a super-small (preferably PHP) web app, which will serve (among other things) as a minimal front-end to a git repository. Any library/article for reading a git repository (".git" folder) without having to execute the "git" process? I'm looking for an API to manage a git repository. I'm only i...
Executing the command git clone [email protected]:whatever creates a directory in my current folder named whatever, and drops the contents of the git repo into that folder: /httpdocs/whatever/public My problem is that I need the contents of the git repository cloned into my current directory so that they appear in the proper location for...
I have two small git repos. The projects both started from different points but converged to a very similar one (same file names, folder structure, etc). One is not a branch of the other, but one can be considered an evolution of the other. It would be nice if I could merge the two so that repo2 is the continuation of repo1. Is this ...
Due to external weird constraints I cannot modify the .gitignore of my repository. Is there a way to ignore files and directories other than modifying a .gitignore? Even if it is a global solution like a global configuration that will be applied to all my repositories. ...
I use git to interface with an SVN repository. I have several git branches for the different projects I work on. Now, whenever I switch from one branch to another using 'git checkout ', all the compiled executables and object files from the previous branch are still there. What I would like to see is that switching from branch A to B r...
Can i tell git to ignore files that are modified (deleted) but should not be committed? The situation is that i have a subdir in the repo which contains stuff I'm not interested in at all, so I deleted it to prevent it showing up in auto-completions and the like (in the IDE). But now, if I add that folder to .gitignore, simply nothing ...
I'm not a git master, but I have been working with it for some time now, with several different projects. In each project, I always git clone [repository] and from that point, can always git pull, so long as I don't have outstanding changes, of course. Recently, I had to revert to a previous branch, and did so with git checkout 4f82a29...
I have my projects in 2 repositories. One under SVN and one under Git. Whenever I change something in SVN I want to do the same thing to the Git repository. Say I make a change to SVN repository, producing revision 125. How would I apply these same changes to my Git repository (assuming my Git repository is up to date with revision 124)...
Hi everyone, I've made a pretty stupid mistake with a git repository and lost some files I really need. I thought I added all new files to the repo before I commited the change to the current branch (didn't happen though). Then I created a new branch and deleted these files again from the new branch within TextMate with "move to trash"...
I've been doing all my work in Git and pushing to GitHub. I've been very happy with both the software and the site and I have no wish to change my working practices at this point. My PhD adviser is asking all students to keep their work in SVN. I've found tons of documentation and tutorials about to pull down an existing SVN repo into g...