Hi, In my repository I got 2 branch when using git-svn $ git branch -a * master remotes/git-svn Now I can see the diff with $ git diff --name-status remotes/git-svn M global/library/Exception.php How can I revert the modification? Thanks ...
There are lots of webpages out there suggesting hackish ways to make svn externals look like git submodules. I have read some accounts of what the difference is, but this doesn't seem very fundamental: Git submodules link to a particular commit in another project's repository, while svn:externals always fetch the latest revision. W...
Just noticed a scary problem with git svn (git version 1.6.5.2). First commiting my work as normal with git commit, when finished I did git svn dcommit. This started fine with Resetting to the latest refs/remotes/git-svn but then failed and returned the error Unable to extract revision information from commit. This left all files that ...
I've got a repository which contains most of my application settings. I'd like to add .git/config from a different repo and replace it with a symlink in the original repo, but Git complains: error: Invalid path '[...]/.git/config' error: unable to add [...]/.git/config to index fatal: adding files failed Note: I'm not trying to add th...
I was doing some work at home over the weekend and used git to merge code changes back to my office computer (connected via a vpn) and found some very ugly merge problems. First of all the merge should have been very clean as everything was committed at the office on Friday and I only made changes to my home computer on Saturday and Sun...
I got this message from Git: You asked to pull from the remote 'origin', but did not specify a branch. Because this is not the default configured remote for your current branch, you must specify a branch on the command line. Can anyone explain it? and more important how to fix it? ...
We have a Git repository with over 400 commits, the first couple dozen of which were a lot of trial-and-error. We want to clean up these commits by squashing many down into a single commit. Naturally, git-rebase seems the way to go. My problem is that it ends up with merge conflicts, and these conflicts are not easy to resolve. I don't u...
I have a project hosted on GitHub and I use Git for source versioning. I have to pull the code on another platform but it can't have Git, so I am using Subversion Support of GitHub to checkout the code, but it doesn't handle symlinks. For example, on my machine I have a symlink : sf -> ../lib/vendor/symfony/data/web/sf But when the ...
Let's say I have committed many times. Now I want to come back to a certain commit and view how my working directory looked like at that time (I actually want my working directory to change when I do it). And finally go back to original head without messing up my commits?! I know it should be easy to do it, I'm just can't seem to find t...
The problem I am having is whenever I deploy a Drupal site from a git repository, I have to log in to the server and change permissions on a ton of folders by hand. That is something I want to automate. I am considering Capistrano, which I heard great things about, but the downside is it creates several folders in the "sites" folder and ...
FYI, I'm pretty new to git, using mostly gitgui. When I change the name of an already tracked folder containing already tracked files in my project, git sees all the files in the folder as new untracked files. How do I make git understand that I only changed the name of the folder, so that I don't "lose" the history of the files contain...
When I copy a file over top of another file in a git controlled directory... I'm seeing git think that the whole file has changed instead of one small hunk... why? Here is an example of what I mean... http://github.com/cmodien/fileupdatetest/commit/90309ed099e257cd98218b4504cd2cd3a3a47a27 OK... I checked the line endings on the file......
hi, i tried to set up git server and deployment server on the same machine for my ror application. I pushed the project from local machine to the git server/deployment server using the following commands: git remote add origin path_to_git_server git push origin master Then, on the git server, I found the 'master' file under ~/git/lo...
Possible Duplicate: use Winmerge inside of Git to file diff Configuration Win7 64-bit MSysGit WinMerge installed (default location) Although there are many similar questions here, I found no real answers catering for us Microsoft users. Which is the correct way to configure WinMerge as your diff tool with Git 1.7.1 onwards?...
So I've been using git for the first time, and there is a scenario that I don't quite know how to solve. I've got a simple webapp (only html, css and js), and I want to produce regular releases that can be tracked with a version number. This is easy to do with git tag. But the catch is that for my releases I want to do some extra things...
Do you know any good repo monitoring solution? I'd like to get information when someone pushes to remote repo (preferably via taskbar tray icon: "someuser pushed…"). Other solutions I consider: recieve hook periodically git log via cron check for updates on running every git command (my system of choice is Ubuntu) ...
GIT rm filename remove the file from the index as well as from your working directory. Is it possible to remove the file only from the index ? thank you, Alessandro DS ...
Hello all, We are considering switching our VCS to either git or subversion. I'd prefer switching to git, but subversion has a nice feature that I don't see in git : per directory access control. We currently have project1, project2 repositories in cvs, with different permissions. We'd like to have one single repository, with two direc...
I'm working on a project that is using code from an OpenSource project. One of the requirements is to push as much code back to upstream as possible. The remote project is using Subversion (not very well). My current setup looks like this: [Remote SVN] (git svn fetch)-> [My public Git] <-(push/pull)-> [My dev. Git] ...
MacMini $ git push origin master Counting objects: 1916, done. Delta compression using up to 2 threads. Compressing objects: 100% (1751/1751), done. Read from remote host codebasehq.com: Operation timed out fatal: The remote end hung up unexpectedly error: pack-objects died of signal 13 error: pack-objects died with strange error erro...