git-pull

Using git pull to track a remote branch without merging

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...

Unable to push to git Repository. It hangs after "Writing Objects: 100%"

I am running git daemon with the following command. c:\cygwin\bin\git daemon --reuseaddr --base-path=/cygdrive/S --export-all --verbose --enable=receive-pack I am able to clone and pull updates but when I try to push I get $ git push origin master Counting objects: 6, done. Delta compression using up to 2 threads. Compressing objec...

With git how can i merge a repository that has already been merged?

I have a repository that i pulled the changes for, so now it is up to date with the remote repository. Except that now i realized that i needed to pull all of that repositories changes and keep none of mine. I want to go back in history so that i won't get an "Already up-to-date" when i pull. Also part two, how can i pull and get all of ...

GIT / RubyMine (Leopard) - can't pull but I can commit and push

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...

GIT pull/fetch from specific tag

Is there a way to pull/fetch code from a specific tag in a repo. Am aware that after clone, i can checkout to the tag but is it possible to specify a tag during a pull? In ClearCase i can rebase or deliver a specific baseline of code, is there a way where i can use git tags similarly to pull/push code upto a specified tag? ...

Git says local branch is ahead of remote after having pulled from remote

I’m sorry if the title isn’t clear, but this is a weird problem. I git checkout to my "stage" branch and git pull to get my partner’s latest changes (which he pushed last night to the "stage" branch on the remote repository), and sure enough, they merge to my local "stage" branch. git log <branch> shows five commits he performed last ni...