Hello, Ive got weird problem My system is Snow Leopard (10.6.4) - I can't make pull from my RubyMine but I can make commit and push. The best thing is that when I run terminal and type "git pull" it works fine. In ruby mine console there are some errors: /usr/local/git/libexec/git-core/git-sh-setup: line 71: basename: command not foun...
Is it possible to do "git pull" safely in Intellij IDEA 9? Now I am using Git -> Pull Changes... and then I have to select branch explicitly - this is source of error if I pull from not current branch by error. This is completely unsafe. I wonder if there is a safer way to do "git pull" in IDEA through standard UI. Use git pull in comm...
I have read nice things about "branch" in Git recently. It seems like Mercurial's way may be to clone a local repo? But Mercurial has branch too. Does it work as nice as Git? What about saving disk space in Mac / Linux / Windows? Do they all do links on Mac and Linux but make a copy on Windows? ...
It's possible that I'm not really understanding how git works here, but I have a development git branch, and then I created a new branch called development_cached I switched to the development_cached branch, freeze rails version for my project, then I ran two commands git add . and git commit respectively, and then switched back to the...
This is driving me crazy, as it's very easy on gitk (just gitk the/file) but I am not able to do it on gitg which I really like to see the history. It's not a well documented tool... :-/ ...
I'm stuck behind a firewall so have to use https to access my github repository. It's a new one I'm creating & am using cygwin 1.7.7 on XP. I've tried setting the remote to https://[email protected]/oharab/ExcelANT.git, but pushing prompts for a password, but doesn't do anything once I've entered it. https://oharab:github.com/oharab/Exce...
I'm trying to clone my GitHub project using the https-URL, but it fails with an error: $ git clone https://[email protected]/foo/foo-private.git Cloning into foo-private... Password: error: error setting certificate verify locations: CAfile: /bin/curl-ca-bundle.crt CApath: none while accessing https://[email protected]/foo/foo-private.gi...
I would like to checkout a single file from a remote git-repository. Is there a way to checkout a single file from a remote git-repository, without checking out the other commits? EDIT: Following the answers, I've realized that i can do a git fetch, and then a git checkout origin/branch path/to/file, which works great. ...
Hi, How can I install git on CENTOS 5.5 machine? I tried to install it from yum but got following msg. root@host [~]# sudo yum install git Loaded plugins: fastestmirror Loading mirror speeds from cached hostfile * addons: centos.mirrors.tds.net * base: mirror.ubiquityservers.com * extras: mirrors.serveraxis.net * updates: pubmirror...
When using sub-directory entries in .gitignore, "git clean -X" doesn't clean the ignored sub-directory. $ git init test Initialized empty Git repository in /home/jpgariep/git/test/.git/ $ cd test/ $ mkdir -p a/b/c $ touch a/b/c/test $ echo '/a/b/' > .gitignore $ git add .gitignore $ git commit -m "Added .gitignore." [master (root-commit...
I have Eclipse 3.5 and EGit 0.9.3 installed. Gitbash can authenticate fine to Beanstalk, but for some reason Eclipse gives me Auth Failed when I try to import/clone a repo into Eclipse. Also, I don't seem to have git+ssh as a protocol option - why is that? I have copied my files from .ssh to ssh as some other posts have indicated but it...
I like to use git on cygwin, but the only downside I have is when I want to git difftool I cannot use anything useful. git diff is fine for me most of the time, but sometimes I'd like to use winmerge to view these diffs via git difftool is there some way to set this up? ...
I'm getting up to speed on using git with XCode but have run into a situation that I'm not quite sure how to handle. I have a branch of my project "branchA" that has a build target base SDK of iOS 3.2 I have "branchB" that has been forked from branchA that has a build target base SDK for iOS4.2 I'm continuing with development on both ...
I am pretty sure I have tried everything, figured I would ask all the gurus on here. Background: I had an SVN repository on an old linux box. I accessed this SVN repo with git-svn. The system's hard drive crashed and the SVN repo was lost. Question: Since I have an entire backup of the SVN repository on my local machine through me usin...
I am getting this error when trying to create a remote tracking branch git co -b release_2.6 origin/release_2.6 warning: refname 'origin/release_2.6' is ambiguous. warning: refname 'origin/release_2.6' is ambiguous. fatal: Ambiguous object name: 'origin/release_2.6'. I only have these two refs defined with release_2.6 git show-ref | ...
If the base and the source have the same file content, and the destination branch/repo has some other file changes, which content does it keep, the source or the destination file? To explain in detail A | B / \ C D Suppose that a file was added on the A->B edge, and then removed again in B->C, w...
I'm migrating my capistrano setup into webistrano and keep getting this error when I run any deployment commands: executing locally: "git ls-remote [email protected]:REPO.git HEAD" Could not save revision: Unable to resolve revision for 'HEAD' on repository 'REPO_ADDRESSS' My capistrano setup has the same params and works no problem from ...
I have an svn repository where the original structure looked something like: features/ trunk/ branch1/ But then over time moves to the standard svn structure of: trunk/ branches/ tags/ etc. Is there any way for svn2git or git svn to work with this? Alternatively, is there any way to re write svn history in a non-destructive ...
I created a git repo and updated it with some stuff. Later I created a new directory for this project and initialized new git for it. Now I want to push changes and replace the old ones in repo. When I do git push origin master I get ! [rejected] master -> master (non-fast-forward) error: failed to push some refs to 'git@github...
Possible Duplicate: git: rename remote branch Hi, I want to rename a local branch that's also pushed as a remote repository how can I rename them both? ...